*** empty log message ***

[gnu-emacs] / lisp / repeat.el

diff --git a/lisp/repeat.el b/lisp/repeat.el
index cc31a70d9379c5510f74b538d6a35764f53e6b8e..aa73c869675a7248000691fbf350b53e6caf549d 100644 (file)
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -9,12 +9,12 @@
 
 ;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
@@ -126,7 +126,7 @@ only occurs if the final character by which `repeat' was invoked is a
 member of that sequence.  If this variable is nil, no re-execution occurs."
   :group 'convenience
   :type 'boolean)
-  
+
 ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;;
 
 ;; The basic strategy is to use last-command, a variable built in to Emacs.
@@ -262,7 +262,7 @@ can be modified by the global variable `repeat-on-final-keystroke'."
                          (setq repeat-last-self-insert
                                (buffer-substring (car range)
                                                  (cdr range)))
-                       (error (error "%s %s %s" ;Danger, Will Robinson! 
+                       (error (error "%s %s %s" ;Danger, Will Robinson!
                                      "repeat can't intuit what you"
                                      "inserted before auto-fill"
                                      "clobbered it, sorry")))))))
@@ -271,16 +271,20 @@ can be modified by the global variable `repeat-on-final-keystroke'."
            ;; includes that many copies of the same character.
            ;; So use just the first character
            ;; and repeat it the right number of times.
-           (setq insertion (substring insertion 0 1))
+           (setq insertion (substring insertion -1))
            (let ((count (prefix-numeric-value repeat-arg))
                  (i 0))
              (while (< i count)
                (repeat-self-insert insertion)
                (setq i (1+ i)))))
-       (if (or (stringp real-last-command)
-               (vectorp real-last-command))
-           (execute-kbd-macro real-last-command)
-         (call-interactively real-last-command))))
+       (let ((indirect (indirect-function real-last-command)))
+         (if (or (stringp indirect)
+                 (vectorp indirect))
+             ;; Bind real-last-command so that executing the macro
+             ;; does not alter it.
+             (let ((real-last-command real-last-command))
+               (execute-kbd-macro real-last-command))
+           (call-interactively real-last-command)))))
     (when repeat-repeat-char
       ;; A simple recursion here gets into trouble with max-lisp-eval-depth
       ;; on long sequences of repetitions of a command like `forward-word'
@@ -340,4 +344,5 @@ can be modified by the global variable `repeat-on-final-keystroke'."
 
 (provide 'repeat)
 
+;;; arch-tag: cd569600-a1ad-4fa7-9062-bb91dfeaf1db
 ;;; repeat.el ends here