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

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

[elpa] externals/counsel 5d0267e415 07/15: ivy.el (ivy--dynamic-collecti


From: Basil L. Contovounesios
Subject: [elpa] externals/counsel 5d0267e415 07/15: ivy.el (ivy--dynamic-collection-cands): Try to call 2 ways
Date: Sat, 2 Apr 2022 05:58:47 -0400 (EDT)

branch: externals/counsel
commit 5d0267e415defb36164ae1548cabcf0a74181b3b
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    ivy.el (ivy--dynamic-collection-cands): Try to call 2 ways
    
    The first way is Ivy's interface without `pred' and `action'.
    The second way is the `completing-read' interface.
---
 ivy.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ivy.el b/ivy.el
index c72680aec9..7fbf7c704e 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3374,7 +3374,10 @@ Should be run via minibuffer `post-command-hook'."
     t))
 
 (defun ivy--dynamic-collection-cands (input)
-  (let ((coll (funcall (ivy-state-collection ivy-last) input)))
+  (let ((coll (condition-case nil
+                  (funcall (ivy-state-collection ivy-last) input)
+                (error
+                 (funcall (ivy-state-collection ivy-last) input nil nil)))))
     (if (listp coll)
         (mapcar (lambda (x) (if (consp x) (car x) x)) coll)
       coll)))



reply via email to

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