diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/kmacro.el | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2233642e5b4..24ce2276991 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-07-06 Glenn Morris <rgm@gnu.org> + * 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 <michael.albinus@gmx.de> diff --git a/lisp/kmacro.el b/lisp/kmacro.el index ffc97085a69..6ecac2cdf28 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -629,8 +629,7 @@ others, use \\[kmacro-name-last-macro]." (> (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 @@ others, use \\[kmacro-name-last-macro]." (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). |