* lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands

in the keyboard macro.

Fixes: debbugs:15126

2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 822d0eaf17f..b8ffbc48471 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2013-08-27  Juri Linkov  <juri@jurta.org>
 
+        * isearch.el (isearch-other-meta-char): Don't store kmacro commands
+        in the keyboard macro.  (Bug#15126)
+
+2013-08-27  Juri Linkov  <juri@jurta.org>
+
         * isearch.el (isearch-quote-char): Comment out converting unibyte
         to multibyte, thus syncing with its `quoted-insert' counterpart.
         (Bug#15166)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 345e7d8b4e9..32de931954f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2386,6 +2386,13 @@ Isearch mode."
              (isearch-unread-key-sequence keylist)
              (setq main-event (car unread-command-events))
 
+             ;; Don't store special commands in the keyboard macro.
+             (let (overriding-terminal-local-map)
+               (when (memq (key-binding key)
+                           '(kmacro-start-macro
+                             kmacro-end-macro kmacro-end-and-call-macro))
+                 (cancel-kbd-macro-events)))
+
              ;; If we got a mouse click event, that event contains the
              ;; window clicked on. maybe it was read with the buffer
              ;; it was clicked on.  If so, that buffer, not the current one,