Update years in copyright notice; nfc.

[gnu-emacs] / lisp / repeat.el

diff --git a/lisp/repeat.el b/lisp/repeat.el
index 3d3f464488d64b4a0653b2a6f349f5090b232e95..b225b729defa7460a87f48609165c0a54dad38c6 100644 (file)
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -1,6 +1,7 @@
 ;;; repeat.el --- convenient way to repeat the previous command
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Will Mengarini <seldon@eskimo.com>
 ;; Created: Mo 02 Mar 98
@@ -9,20 +10,20 @@
 
 ;; 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.
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -126,7 +127,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.
@@ -147,14 +148,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.
@@ -270,7 +263,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")))))))
@@ -279,16 +272,22 @@ 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))
+            (run-hooks 'pre-command-hook)
+           (call-interactively real-last-command)
+            (run-hooks 'post-command-hook)))))
     (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'
@@ -348,4 +347,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