X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/4a6eea94edb138a3ea73e7a50553b69dedc5c3ad..c845c43aaa6cfc42e8b4a8eeaa370aa85caf02f2:/company-dabbrev.el

diff --git a/company-dabbrev.el b/company-dabbrev.el
index 34acffe5d..37dceccce 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -92,10 +92,10 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'."
               (throw 'done 'company-time-out))))))
 
 (defun company-dabbrev--make-regexp (prefix)
-  (concat "\\<" (if (equal prefix "")
-                    (concat "\\(?:" company-dabbrev-char-regexp "\\)")
-                  (regexp-quote prefix))
-          "\\(?:" company-dabbrev-char-regexp "\\)*\\>"))
+  (concat (if (equal prefix "")
+              (concat "\\(?:" company-dabbrev-char-regexp "\\)")
+            (regexp-quote prefix))
+          "\\(?:" company-dabbrev-char-regexp "\\)*"))
 
 (defun company-dabbrev--search-buffer (regexp pos symbols start limit
                                        ignore-comments)
@@ -108,14 +108,24 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'."
                                         (invisible-p (match-beginning 0)))))
                      (push match symbols)))))
       (goto-char (if pos (1- pos) (point-min)))
-      ;; search before pos
-      (company-dabrev--time-limit-while (re-search-backward regexp nil t)
-          start limit
-        (if (and ignore-comments (save-match-data (company-in-string-or-comment)))
-            (goto-char (nth 8 (syntax-ppss)))
-          (maybe-collect-match)))
+      ;; Search before pos.
+      (let ((tmp-end (point)))
+        (company-dabrev--time-limit-while (not (bobp))
+            start limit
+          (ignore-errors
+            (forward-char -10000))
+          (forward-line 0)
+          (save-excursion
+            ;; 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'.
+            (while (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
+      ;; Search after pos.
       (company-dabrev--time-limit-while (re-search-forward regexp nil t)
           start limit
         (if (and ignore-comments (save-match-data (company-in-string-or-comment)))