From: Juri Linkov Date: Tue, 27 Aug 2013 16:06:16 +0000 (+0300) Subject: * lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~94 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbe558f1959b1cd51428b5fcbf940df515266abc;p=emacs.git * 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 822d0eaf17f..b8ffbc48471 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-08-27 Juri Linkov + + * isearch.el (isearch-other-meta-char): Don't store kmacro commands + in the keyboard macro. (Bug#15126) + 2013-08-27 Juri Linkov * isearch.el (isearch-quote-char): Comment out converting unibyte 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,