[elpa] master a87bdd2 358/399: ivy.el (ivy-read): Refactor

[Oleh Krehel]

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

    ivy.el (ivy-read): Refactor
    
    Move setq outside of let.
---
 ivy.el | 60 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/ivy.el b/ivy.el
index ffa7fb3..d27c21b 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1971,42 +1971,42 @@ customizations apply to the current completion session."
   (setq caller (or caller this-command))
   (setq ivy--extra-candidates (ivy--compute-extra-candidates caller))
   (setq ivy-marked-candidates nil)
+  (setq ivy-last
+        (make-ivy-state
+         :prompt prompt
+         :collection collection
+         :predicate predicate
+         :require-match require-match
+         :initial-input initial-input
+         :history history
+         :preselect preselect
+         :keymap keymap
+         :update-fn (if (eq update-fn 'auto)
+                        (lambda ()
+                          (funcall (ivy--get-action ivy-last)
+                                   (ivy-state-current ivy-last)))
+                      update-fn)
+         :sort sort
+         :action (ivy--compute-extra-actions action caller)
+         :multi-action multi-action
+         :frame (selected-frame)
+         :window (selected-window)
+         :buffer (current-buffer)
+         :unwind unwind
+         :re-builder re-builder
+         :matcher matcher
+         :dynamic-collection dynamic-collection
+         :display-transformer-fn (plist-get ivy--display-transformers-list 
caller)
+         :directory default-directory
+         :caller caller
+         :def def))
+  (ivy--reset-state ivy-last)
   (let* ((ivy-recursive-last (and (active-minibuffer-window) ivy-last))
          (ivy--display-function
           (when (or ivy-recursive-last
                     (not (window-minibuffer-p)))
             (ivy-alist-setting ivy-display-functions-alist caller)))
          (height (ivy--height caller)))
-    (setq ivy-last
-          (make-ivy-state
-           :prompt prompt
-           :collection collection
-           :predicate predicate
-           :require-match require-match
-           :initial-input initial-input
-           :history history
-           :preselect preselect
-           :keymap keymap
-           :update-fn (if (eq update-fn 'auto)
-                          (lambda ()
-                            (funcall (ivy--get-action ivy-last)
-                                     (ivy-state-current ivy-last)))
-                        update-fn)
-           :sort sort
-           :action (ivy--compute-extra-actions action caller)
-           :multi-action multi-action
-           :frame (selected-frame)
-           :window (selected-window)
-           :buffer (current-buffer)
-           :unwind unwind
-           :re-builder re-builder
-           :matcher matcher
-           :dynamic-collection dynamic-collection
-           :display-transformer-fn (plist-get ivy--display-transformers-list 
caller)
-           :directory default-directory
-           :caller caller
-           :def def))
-    (ivy--reset-state ivy-last)
     (unwind-protect
          (minibuffer-with-setup-hook
              #'ivy--minibuffer-setup