;;; 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
;; 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:
;;; Code:
-(eval-when-compile (require 'cl))
-
;;;;; ************************* USER OPTIONS ************************** ;;;;;
(defcustom repeat-too-dangerous '(kill-this-buffer)
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.
;; 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.
(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")))))))
(setq repeat-num-input-keys-at-self-insert num-input-keys)
- (loop repeat (prefix-numeric-value repeat-arg) do
- (repeat-self-insert insertion)))
- (call-interactively real-last-command)))
+ ;; If the self-insert had a repeat count, INSERTION
+ ;; 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 -1))
+ (let ((count (prefix-numeric-value repeat-arg))
+ (i 0))
+ (while (< i count)
+ (repeat-self-insert insertion)
+ (setq i (1+ i)))))
+ (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'
(provide 'repeat)
+;;; arch-tag: cd569600-a1ad-4fa7-9062-bb91dfeaf1db
;;; repeat.el ends here