Mercurial > emacs
changeset 61130:71175894291a
(kmacro-end-macro): Isearch may store this command
into the macro -- so ignore it when executing keyboard macro.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 30 Mar 2005 10:25:10 +0000 |
| parents | 646401e7ef19 |
| children | c1bccf491869 |
| files | lisp/kmacro.el |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/kmacro.el Wed Mar 30 10:24:55 2005 +0000 +++ b/lisp/kmacro.el Wed Mar 30 10:25:10 2005 +0000 @@ -614,10 +614,13 @@ 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