]> code.delx.au - gnu-emacs-elpa/commitdiff
Fix initial-input not set to nil for 'read-file-name-internal
authorOleh Krehel <ohwoeowho@gmail.com>
Sun, 14 Feb 2016 17:39:44 +0000 (18:39 +0100)
committerOleh Krehel <ohwoeowho@gmail.com>
Sun, 14 Feb 2016 17:39:44 +0000 (18:39 +0100)
ivy.el (ivy--reset-state): This change is due to (ivy-set-actions t ...)

ivy.el

diff --git a/ivy.el b/ivy.el
index 994d1927e7a694c3f568efb9798606f3e40451ae..042dc4aa6d25b56d69b806a135b8b8e121f0262c 100644 (file)
--- a/ivy.el
+++ b/ivy.el
@@ -1337,7 +1337,8 @@ This is useful for recursive `ivy-read'."
                            (equal initial-input default-directory)
                            (equal initial-input ""))
                  (setq coll (cons initial-input coll)))
-               (unless (ivy-state-action ivy-last)
+               (unless (and (ivy-state-action ivy-last)
+                            (not (equal (ivy--get-action ivy-last) 'identity)))
                  (setq initial-input nil))))
             ((eq collection 'internal-complete-buffer)
              (setq coll (ivy--buffer-list "" ivy-use-virtual-buffers)))