]> code.delx.au - gnu-emacs-elpa/commitdiff
Fix ivy-resume issue caused by the recursive calls change
authorOleh Krehel <ohwoeowho@gmail.com>
Sun, 29 Nov 2015 10:15:17 +0000 (11:15 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Sun, 29 Nov 2015 10:15:17 +0000 (11:15 +0100)
* 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

diff --git a/ivy.el b/ivy.el
index a5656296180f44fc158bfe8fa263c313c271e377..5b0d2c2e2bd1ab4a98e23704eb64408fe7104697 100644 (file)
--- 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