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

in the keyboard macro.

Fixes: debbugs:15126

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 822d0eaf17f44b0eb90906592bd68870040861fd..b8ffbc484717748f2c0b78a2e65aa0b1ce642e9f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 345e7d8b4e96ec07bb6378784baacb87224a704a..32de931954f6e5e73154729d7e15f02a20b1a63c 100644 (file)
--- 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,