aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-06-24 15:16:33 -0400
committerChong Yidong2010-06-24 15:16:33 -0400
commit8f8043160b10f68e6bf06a97acc5296e2c50a419 (patch)
tree78fa4a8b0bfb1df962a6ef8b03a63d6ca579c7f4
parent3b3807f859b453f840acb04bf5773ab9fcce2413 (diff)
downloademacs-8f8043160b10f68e6bf06a97acc5296e2c50a419.tar.gz
emacs-8f8043160b10f68e6bf06a97acc5296e2c50a419.zip
Don't issue kmacro hint if echo area is in use (Bug#3412).
* lisp/kmacro.el (kmacro-call-macro): Don't issue hint message if the echo area is in use (Bug#3412).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/kmacro.el12
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8836a3866ff..23d7045532c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-06-24 Chong Yidong <cyd@stupidchicken.com>
2
3 * kmacro.el (kmacro-call-macro): Don't issue hint message if the
4 echo area is in use (Bug#3412).
5
12010-06-22 Glenn Morris <rgm@gnu.org> 62010-06-22 Glenn Morris <rgm@gnu.org>
2 7
3 * textmodes/texinfmt.el (texinfo-format-region) 8 * textmodes/texinfmt.el (texinfo-format-region)
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index c2bedf35339..439c7383223 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -642,11 +642,13 @@ others, use \\[kmacro-name-last-macro]."
642 kmacro-call-repeat-key))) 642 kmacro-call-repeat-key)))
643 (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) 643 (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
644 (while repeat-key 644 (while repeat-key
645 (message "(Type %s to repeat macro%s)" 645 ;; Issue a hint to the user, if the echo area isn't in use.
646 repeat-key-str 646 (unless (current-message)
647 (if (and kmacro-call-repeat-with-arg 647 (message "(Type %s to repeat macro%s)"
648 arg (> arg 1)) 648 repeat-key-str
649 (format " %d times" arg) "")) 649 (if (and kmacro-call-repeat-with-arg
650 arg (> arg 1))
651 (format " %d times" arg) "")))
650 (if (equal repeat-key (read-event)) 652 (if (equal repeat-key (read-event))
651 (progn 653 (progn
652 (clear-this-command-keys t) 654 (clear-this-command-keys t)