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

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

[elpa] master b5dc239 032/272: counsel.el (counsel--async-sentinel): Fix


From: Oleh Krehel
Subject: [elpa] master b5dc239 032/272: counsel.el (counsel--async-sentinel): Fix issue with ivy--regex-ignore-order
Date: Mon, 25 Apr 2016 10:13:15 +0000

branch: master
commit b5dc239a30e2e692f4ee8962205f893793749a2a
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    counsel.el (counsel--async-sentinel): Fix issue with ivy--regex-ignore-order
    
    Fixes #342
---
 counsel.el |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/counsel.el b/counsel.el
index b40d409..9c9bcca 100644
--- a/counsel.el
+++ b/counsel.el
@@ -554,10 +554,11 @@ Or the time of the last minibuffer update.")
                          (ivy-state-preselect ivy-last)
                          ivy--all-candidates)
                         0))
-            (ivy--recompute-index
-             ivy-text
-             (funcall ivy--regex-function ivy-text)
-             ivy--all-candidates))
+            (let ((re (funcall ivy--regex-function ivy-text)))
+              (unless (stringp re)
+                (setq re (caar re)))
+              (ivy--recompute-index
+               ivy-text re ivy--all-candidates)))
           (setq ivy--old-cands ivy--all-candidates))
         (ivy--exhibit))
     (if (string= event "exited abnormally with code 1\n")



reply via email to

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