From: Kim F. Storm <storm@cua.dk>
Date: Wed, 30 Mar 2005 10:25:10 +0000 (+0000)
Subject: (kmacro-end-macro): Isearch may store this command
X-Git-Tag: ttn-vms-21-2-B4~1362
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e9691cca876ec0e9c6d96dbf70427e3fd699c090;p=emacs.git

(kmacro-end-macro): Isearch may store this command
into the macro -- so ignore it when executing keyboard macro.
---

diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index c6a97bb3d34..20816fc7fea 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -614,10 +614,13 @@ With numeric arg, repeat macro now that many times,
 counting the definition just completed as the first repetition.
 An argument of zero means repeat until error."
   (interactive "P")
-  (end-kbd-macro arg #'kmacro-loop-setup-function)
-  (when (and last-kbd-macro (= (length last-kbd-macro) 0))
-    (message "Ignore empty macro")
-    (kmacro-pop-ring)))
+   ;; Isearch may push the kmacro-end-macro key sequence onto the macro.
+   ;; Just ignore it when executing the macro.
+  (unless executing-kbd-macro
+    (end-kbd-macro arg #'kmacro-loop-setup-function)
+    (when (and last-kbd-macro (= (length last-kbd-macro) 0))
+      (message "Ignore empty macro")
+      (kmacro-pop-ring))))
 
 
 ;;;###autoload