[Emacs-diffs] trunk r114029: * lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands

[Juri Linkov]

------------------------------------------------------------
revno: 114029
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15126
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-27 19:06:16 +0300
message:
  * lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands
  in the keyboard macro.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-27 15:57:16 +0000
+++ b/lisp/ChangeLog    2013-08-27 16:06:16 +0000
@@ -1,5 +1,10 @@
 2013-08-27  Juri Linkov  <address@hidden>
 
+       * isearch.el (isearch-other-meta-char): Don't store kmacro commands
+       in the keyboard macro.  (Bug#15126)
+
+2013-08-27  Juri Linkov  <address@hidden>
+
        * isearch.el (isearch-quote-char): Comment out converting unibyte
        to multibyte, thus syncing with its `quoted-insert' counterpart.
        (Bug#15166)

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-08-27 15:57:16 +0000
+++ b/lisp/isearch.el   2013-08-27 16:06:16 +0000
@@ -2386,6 +2386,13 @@
              (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,