Mercurial > emacs
comparison lisp/kmacro.el @ 90133:4da4a09e8b1b
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-31
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 206-222)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 45-52)
- Update from CVS
- Update from CVS: texi Makefile.in CVS keyw cruft
- Update from CVS: ChangeLog tweaks
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 31 Mar 2005 09:58:14 +0000 |
parents | 3ebd9bdb4fe5 71175894291a |
children | 08185296b491 |
comparison
equal
deleted
inserted
replaced
90132:4080fe8b4f0f | 90133:4da4a09e8b1b |
---|---|
612 | 612 |
613 With numeric arg, repeat macro now that many times, | 613 With numeric arg, repeat macro now that many times, |
614 counting the definition just completed as the first repetition. | 614 counting the definition just completed as the first repetition. |
615 An argument of zero means repeat until error." | 615 An argument of zero means repeat until error." |
616 (interactive "P") | 616 (interactive "P") |
617 (end-kbd-macro arg #'kmacro-loop-setup-function) | 617 ;; Isearch may push the kmacro-end-macro key sequence onto the macro. |
618 (when (and last-kbd-macro (= (length last-kbd-macro) 0)) | 618 ;; Just ignore it when executing the macro. |
619 (message "Ignore empty macro") | 619 (unless executing-kbd-macro |
620 (kmacro-pop-ring))) | 620 (end-kbd-macro arg #'kmacro-loop-setup-function) |
621 (when (and last-kbd-macro (= (length last-kbd-macro) 0)) | |
622 (message "Ignore empty macro") | |
623 (kmacro-pop-ring)))) | |
621 | 624 |
622 | 625 |
623 ;;;###autoload | 626 ;;;###autoload |
624 (defun kmacro-call-macro (arg &optional no-repeat end-macro) | 627 (defun kmacro-call-macro (arg &optional no-repeat end-macro) |
625 "Call the last keyboard macro that you defined with \\[kmacro-start-macro]. | 628 "Call the last keyboard macro that you defined with \\[kmacro-start-macro]. |