Mercurial > emacs

changeset 81942:7f057e1b1d19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(kmacro-end-macro): When ignoring empty macro avoid incorrect kmacro-ring-empty-p messages.
author Martin Rudalics <rudalics@gmx.at>
date Wed, 18 Jul 2007 08:46:42 +0000
parents bff8a71eeb05
children d32ff111504c
files lisp/kmacro.el
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/kmacro.el	Tue Jul 17 21:34:31 2007 +0000
+++ b/lisp/kmacro.el	Wed Jul 18 08:46:42 2007 +0000
@@ -606,8 +606,11 @@
   (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