[Emacs-diffs] /srv/bzr/emacs/trunk r108924: * lisp/kmacro.el (kmacro-call-macro): Restore repeat message. (Bug#11817)

[Glenn Morris]

------------------------------------------------------------
revno: 108924
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-06 17:34:49 -0400
message:
  * lisp/kmacro.el (kmacro-call-macro): Restore repeat message.  (Bug#11817)
modified:
  lisp/ChangeLog
  lisp/kmacro.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-06 19:06:54 +0000
+++ b/lisp/ChangeLog    2012-07-06 21:34:49 +0000
@@ -1,5 +1,7 @@
 2012-07-06  Glenn Morris  <address@hidden>
 
+       * kmacro.el (kmacro-call-macro): Restore repeat message.  (Bug#11817)
+
        * files.el (toggle-read-only): Restrict message to interactive use.
 
 2012-07-06  Michael Albinus  <address@hidden>

=== modified file 'lisp/kmacro.el'
--- a/lisp/kmacro.el    2012-05-05 02:50:20 +0000
+++ b/lisp/kmacro.el    2012-07-06 21:34:49 +0000
@@ -629,8 +629,7 @@
                                   (> (length (this-single-command-keys)) 1))
                              ;; Used when we're in the process of repeating.
                              (eq no-repeat 'repeating))
-                        last-input-event))
-       repeat-key-str)
+                        last-input-event)))
     (if end-macro
        (kmacro-end-macro arg)
       (call-last-kbd-macro arg #'kmacro-loop-setup-function))
@@ -641,7 +640,13 @@
                     (if (eq kmacro-call-repeat-key t)
                         repeat-key
                       kmacro-call-repeat-key)))
-      (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
+      ;; Issue a hint to the user, if the echo area isn't in use.
+      (unless (current-message)
+       (message "(Type %s to repeat macro%s)"
+                (format-kbd-macro (vector repeat-key) nil)
+                (if (and kmacro-call-repeat-with-arg
+                         arg (> arg 1))
+                    (format " %d times" arg) "")))
       ;; Can't use the `keep-pred' arg because this overlay keymap needs to be
       ;; removed during the next run of the kmacro (i.e. we need to add&remove
       ;; this overlay-map at each repetition).