[elpa] master ed579dd 274/348: ivy.el: Fix ivy-highlight-functions-alist

[Oleh Krehel]

branch: master
commit ed579dd36b4a1bea4b2cd627d0817eab1e3689da
Author: Jean-Philippe Bernardy <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el: Fix ivy-highlight-functions-alist
    
    Re #654
    Fixes #827
---
 ivy.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ivy.el b/ivy.el
index 97c41b4..977de7a 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1547,9 +1547,9 @@ This is useful for recursive `ivy-read'."
     (setq ivy-use-ignore ivy-use-ignore-default)
     (setq ivy--highlight-function
           (if (and (eq ivy--regex-function 'swiper--re-builder)
-                   (eq (cdr (assoc t ivy-re-builders-alist))
-                       'ivy--regex-fuzzy))
-              #'ivy--highlight-fuzzy
+                   (assoc t ivy-re-builders-alist)
+                   (assoc (cdr (assoc t ivy-re-builders-alist)) 
ivy-highlight-functions-alist))
+              (cdr (assoc (cdr (assoc t ivy-re-builders-alist)) 
ivy-highlight-functions-alist))
             (or (cdr (assoc ivy--regex-function
                             ivy-highlight-functions-alist))
                 #'ivy--highlight-default)))
@@ -2456,7 +2456,7 @@ CANDIDATES are assumed to be static."
           (setq ivy--old-cands (ivy--sort name cands))
           (ivy--recompute-index name re-str ivy--old-cands))
         (setq ivy--old-re
-              (if (eq ivy--regex-function 'ivy--regex-ignore-order)
+              (if (eq ivy--highlight-function 'ivy--highlight-ignore-order)
                   re
                 (if ivy--old-cands
                     re-str