emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/cape de5adc124f 1/3: Revert "cape-dabbrev-check-other-b


From: ELPA Syncer
Subject: [elpa] externals/cape de5adc124f 1/3: Revert "cape-dabbrev-check-other-buffers: More defensive function check (Fix #127)"
Date: Sun, 18 Aug 2024 12:57:46 -0400 (EDT)

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

    Revert "cape-dabbrev-check-other-buffers: More defensive function check 
(Fix #127)"
    
    This reverts commit 9476f6c38318bd762e749b0a33bdd4bf2073790c.
---
 cape.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cape.el b/cape.el
index f202e33514..cfdbfc8589 100644
--- a/cape.el
+++ b/cape.el
@@ -567,13 +567,14 @@ If INTERACTIVE is nil the function acts like a Capf."
 (defun cape--dabbrev-list (input)
   "Find all Dabbrev expansions for INPUT."
   (cape--silent
-    (dlet ((fun-p (and (not (memq cape-dabbrev-check-other-buffers '(nil t 
some)))
-                       (functionp cape-dabbrev-check-other-buffers)))
-           (dabbrev-check-other-buffers
-            (and cape-dabbrev-check-other-buffers (not fun-p)))
-           (dabbrev-check-all-buffers (eq cape-dabbrev-check-other-buffers t))
+    (dlet ((dabbrev-check-other-buffers
+            (and cape-dabbrev-check-other-buffers
+                 (not (functionp cape-dabbrev-check-other-buffers))))
+           (dabbrev-check-all-buffers
+            (eq cape-dabbrev-check-other-buffers t))
            (dabbrev-search-these-buffers-only
-            (and fun-p (funcall cape-dabbrev-check-other-buffers))))
+            (and (functionp cape-dabbrev-check-other-buffers)
+                 (funcall cape-dabbrev-check-other-buffers))))
       (dabbrev--reset-global-variables)
       (cons
        (apply-partially #'string-prefix-p input)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]