]> code.delx.au - gnu-emacs-elpa/commitdiff
ivy.el (ivy-read): Make "M-o" not modify the action
authorOleh Krehel <ohwoeowho@gmail.com>
Wed, 30 Mar 2016 19:19:37 +0000 (21:19 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Wed, 30 Mar 2016 19:19:37 +0000 (21:19 +0200)
Re #454

ivy.el

diff --git a/ivy.el b/ivy.el
index 964a94757916a076cebb1d8ede6eb94e71de56d9..0a7e11501f1c935f53dedfb9ab380c138ad1f191 100644 (file)
--- a/ivy.el
+++ b/ivy.el
@@ -1281,7 +1281,9 @@ customizations apply to the current completion session."
         (transformer-fn
          (plist-get ivy--display-transformers-list
                     (or caller (and (functionp collection)
-                                    collection)))))
+                                    collection))))
+        (original-action (and (consp action)
+                              (copy-sequence action))))
     (setq ivy-last
           (make-ivy-state
            :prompt prompt
@@ -1337,6 +1339,8 @@ customizations apply to the current completion session."
             (when recursive-ivy-last
               (ivy--reset-state (setq ivy-last recursive-ivy-last)))))
       (ivy-call)
+      (when original-action
+        (setf (ivy-state-action ivy-last) original-action))
       (when (and recursive-ivy-last
                  ivy-recursive-restore)
         (ivy--reset-state (setq ivy-last recursive-ivy-last))))))