[elpa] externals/company 6116c46 2/2: Merge pull request #1047 from kiennq/bug/cancel-on-unique

[ELPA Syncer]

branch: externals/company
commit 6116c4617a7934acfe84cb82a058e9b198f0f480
Merge: 5956a34 1ca51e5
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>

    Merge pull request #1047 from kiennq/bug/cancel-on-unique
    
    company--continue: also check for company-abort-on-unique-match
---
 company.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/company.el b/company.el
index d352e3f..c20475e 100644
--- a/company.el
+++ b/company.el
@@ -1606,7 +1606,8 @@ prefix match (same case) will be prioritized."
                           (- company-point (length company-prefix))))
               (company-calculate-candidates new-prefix ignore-case))))
     (cond
-     ((company--unique-match-p c new-prefix ignore-case)
+     ((and company-abort-on-unique-match
+           (company--unique-match-p c new-prefix ignore-case))
       ;; Handle it like completion was aborted, to differentiate from user
       ;; calling one of Company's commands to insert the candidate,
       ;; not to trigger template expansion, etc.