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

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

[elpa] externals/ivy-hydra f67a2bb 215/395: ivy.el (ivy--filter): Priori


From: Basil L. Contovounesios
Subject: [elpa] externals/ivy-hydra f67a2bb 215/395: ivy.el (ivy--filter): Prioritize :matcher
Date: Thu, 25 Feb 2021 08:32:05 -0500 (EST)

branch: externals/ivy-hydra
commit f67a2bb46b12062613b0a576bd83c2f2a4f8c9cf
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    ivy.el (ivy--filter): Prioritize :matcher
    
    Fixes #2519
---
 ivy.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ivy.el b/ivy.el
index 0e97bdc..ca90c9a 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3565,6 +3565,8 @@ CANDIDATES are assumed to be static."
              (matcher (ivy-state-matcher ivy-last))
              (case-fold-search (ivy--case-fold-p name))
              (cands (cond
+                      (matcher
+                       (funcall matcher re candidates))
                       ((and ivy--old-re
                             (stringp re)
                             (stringp ivy--old-re)
@@ -3578,8 +3580,6 @@ CANDIDATES are assumed to be static."
                                   '(0 2))
                             ivy--old-cands
                             (ivy--re-filter re ivy--old-cands)))
-                      (matcher
-                       (funcall matcher re candidates))
                       (t
                        (ivy--re-filter re candidates)))))
         (if (memq (cdr (assq (ivy-state-caller ivy-last)



reply via email to

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