*** empty log message ***

[gnu-emacs] / lisp / repeat.el

diff --git a/lisp/repeat.el b/lisp/repeat.el
index 3d3f464488d64b4a0653b2a6f349f5090b232e95..667303076ddfad7e7f6d69df733a7e75b2589b10 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.
@@ -147,14 +147,6 @@ member of that sequence.  If this variable is nil, no re-execution occurs."
 ;; true-last-command by putting something in post-command-hook, but that
 ;; entails a performance hit; the approach taken below avoids that.
 
-;; First cope with (kill-region).  It's straightforward to advise it to save
-;; the true value of this-command before clobbering it.
-
-(require 'advice)
-
-(defvar repeat-last-kill-command nil
-  "True value of `this-command' before (`kill-region') clobbered it.")
-
 ;; Coping with strings of self-insert commands gets hairy when they interact
 ;; with auto-filling.  Most problems are eliminated by remembering what we're
 ;; self-inserting, so we only need to get it from the undo information once.
@@ -279,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'