[elpa] externals/cape f270456b5d 041/146: Improve cape-dabbrev-capf

[ELPA Syncer]

branch: externals/cape
commit f270456b5d5ace09c17f6267028bc411d3f20220
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Improve cape-dabbrev-capf
---
 cape.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/cape.el b/cape.el
index 97b869e36c..d3a678ae3a 100644
--- a/cape.el
+++ b/cape.el
@@ -373,15 +373,19 @@ METADATA is optional completion metadata."
 (declare-function dabbrev--ignore-case-p "dabbrev")
 (declare-function dabbrev--find-all-expansions "dabbrev")
 (declare-function dabbrev--reset-global-variables "dabbrev")
+(declare-function dabbrev--abbrev-at-point "dabbrev")
 
 ;;;###autoload
 (defun cape-dabbrev-capf ()
   "Ispell completion-at-point-function."
-  (when-let (bounds (bounds-of-thing-at-point 'word))
-    `(,(car bounds) ,(cdr bounds)
-      ,(cape--cached-table (car bounds) (cdr bounds) 'prefix 
#'cape--dabbrev-expansions)
-      :exclusive no
-      ,@cape--dabbrev-properties)))
+  (let ((abbrev (ignore-errors (dabbrev--abbrev-at-point))))
+    (when (and abbrev (not (string-match-p "\\s-" abbrev)))
+      (let ((beg (progn (search-backward abbrev) (point)))
+            (end (progn (search-forward abbrev) (point))))
+        `(,beg ,end
+          ,(cape--cached-table beg end 'prefix #'cape--dabbrev-expansions)
+          :exclusive no
+          ,@cape--dabbrev-properties)))))
 
 (defun cape--dabbrev-expansions (word)
   "Find all dabbrev expansions for WORD."