branch: master
commit 916e2816a27a371b56364aa64733415ba186847c
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
ivy.el (ivy-read): Fix bad refactor
Don't move out (setq ivy-last ...) out of the let block. It first
needs to be captured by `ivy-recursive-last'.
---
ivy.el | 60 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/ivy.el b/ivy.el
index 4111b4d..83750b2 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1969,41 +1969,41 @@ CALLER is a symbol to uniquely identify the caller to
`ivy-read'.
It is used, along with COLLECTION, to determine which
customizations apply to the current completion session."
(setq caller (or caller this-command))
- (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))))
+ (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
