summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2007-07-18 08:46:42 +0000
committerMartin Rudalics <rudalics@gmx.at>2007-07-18 08:46:42 +0000
commit59f63e9aa5e8dd069f5fa60e04c540af1f6f50a8 (patch)
tree2c534e511788fb3892b40d4c00827a2e43a2e70b
parent41bd52f71d8628aec471f2e8036bebf9730d57a0 (diff)
downloademacs-59f63e9aa5e8dd069f5fa60e04c540af1f6f50a8.tar.gz
(kmacro-end-macro): When ignoring empty macro
avoid incorrect kmacro-ring-empty-p messages.
-rw-r--r--lisp/kmacro.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index bfc0edba2c1..8d162e73da6 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -606,8 +606,11 @@ An argument of zero means repeat until error."
(unless executing-kbd-macro
(end-kbd-macro arg #'kmacro-loop-setup-function)
(when (and last-kbd-macro (= (length last-kbd-macro) 0))
+ (setq last-kbd-macro nil)
(message "Ignore empty macro")
- (kmacro-pop-ring))))
+ ;; Don't call `kmacro-ring-empty-p' to avoid its messages.
+ (while (and (null last-kbd-macro) kmacro-ring)
+ (kmacro-pop-ring1)))))
;;;###autoload