[elpa] master ee0d9e3 275/348: ivy.el (ivy--reset-state): Simplify

[Oleh Krehel]

branch: master
commit ee0d9e3cdf5ab7ec78625ea2045ed73ad394eac8
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>

    ivy.el (ivy--reset-state): Simplify
    
    Re #827
---
 ivy.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ivy.el b/ivy.el
index 977de7a..b7cee81 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1545,14 +1545,15 @@ This is useful for recursive `ivy-read'."
     (setq ivy-text "")
     (setq ivy-calling nil)
     (setq ivy-use-ignore ivy-use-ignore-default)
-    (setq ivy--highlight-function
-          (if (and (eq ivy--regex-function 'swiper--re-builder)
-                   (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)))
+    (let (reb)
+      (setq ivy--highlight-function
+            (if (and (eq ivy--regex-function 'swiper--re-builder)
+                     (setq reb (cdr (assoc t ivy-re-builders-alist)))
+                     (setq reb (cdr (assoc reb 
ivy-highlight-functions-alist))))
+                reb
+              (or (cdr (assoc ivy--regex-function
+                              ivy-highlight-functions-alist))
+                  #'ivy--highlight-default))))
     (let (coll sort-fn)
       (cond ((eq collection 'Info-read-node-name-1)
              (if (equal Info-current-file "dir")