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

    Fix ivy-resume issue caused by the recursive calls change
    
    * ivy.el (ivy-read): recursive-ivy-last is only set if there's an active
      minibuffer window. If this check isn't made, it causes the previous
      `ivy-last' to be reset after the current one, so `ivy-resume' would
      resume not the last command.
---
 ivy.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ivy.el b/ivy.el
index a565629..5b0d2c2 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1056,7 +1056,7 @@ customizations apply to the current completion session."
                   ("o" ,action "default")
                   ,@extra-actions)
               (delete-dups (append action extra-actions))))))
-  (let ((recursive-ivy-last ivy-last))
+  (let ((recursive-ivy-last (and (active-minibuffer-window) ivy-last)))
     (setq ivy-last
           (make-ivy-state
            :prompt prompt

Reply via email to