[elpa] master d033112 28/78: Merge pull request #720 from aaronjensen/abort-dabbrev-on-input

[Dmitry Gutov]

branch: master
commit d033112748440e772f0173b28356e956ce57d8a0
Merge: 096991d cf89f7c
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #720 from aaronjensen/abort-dabbrev-on-input
    
    Abort dabbrev search on input pending
---
 company-dabbrev.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/company-dabbrev.el b/company-dabbrev.el
index b1a9def..ecb7feb 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -110,7 +110,8 @@ This variable affects both `company-dabbrev' and 
`company-dabbrev-code'."
       (goto-char (if pos (1- pos) (point-min)))
       ;; Search before pos.
       (let ((tmp-end (point)))
-        (company-dabbrev--time-limit-while (> tmp-end (point-min))
+        (company-dabbrev--time-limit-while (and (not (input-pending-p))
+                                                (> tmp-end (point-min)))
             start limit 1
           (ignore-errors
             (forward-char -10000))
@@ -119,14 +120,16 @@ This variable affects both `company-dabbrev' and 
`company-dabbrev-code'."
             ;; Before, we used backward search, but it matches non-greedily, 
and
             ;; that forced us to use the "beginning/end of word" anchors in
             ;; `company-dabbrev--make-regexp'.  It's also about 2x slower.
-            (while (re-search-forward regexp tmp-end t)
+            (while (and (not (input-pending-p))
+                        (re-search-forward regexp tmp-end t))
               (if (and ignore-comments (save-match-data 
(company-in-string-or-comment)))
                   (re-search-forward "\\s>\\|\\s!\\|\\s\"" tmp-end t)
                 (maybe-collect-match))))
           (setq tmp-end (point))))
       (goto-char (or pos (point-min)))
       ;; Search after pos.
-      (company-dabbrev--time-limit-while (re-search-forward regexp nil t)
+      (company-dabbrev--time-limit-while (and (not (input-pending-p))
+                                              (re-search-forward regexp nil t))
           start limit 25
         (if (and ignore-comments (save-match-data 
(company-in-string-or-comment)))
             (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)