X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/35fb32880c99aa7cd41b835dc17b8639b544dc69..9805f81dda38cd541ba8043f44e720e06adf6492:/lisp/repeat.el?ds=sidebyside

diff --git a/lisp/repeat.el b/lisp/repeat.el
index edebbe24a8..94efc717be 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -1,11 +1,10 @@
 ;;; repeat.el --- convenient way to repeat the previous command
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Will Mengarini <seldon@eskimo.com>
 ;; Created: Mo 02 Mar 98
-;; Version: 0.51, We 13 May 98
+;; Version: 0.51
 ;; Keywords: convenience, vi, repeat
 
 ;; This file is part of GNU Emacs.
@@ -27,7 +26,7 @@
 
 ;; Sometimes the fastest way to get something done is just to lean on a key;
 ;; moving forward through a series of words by leaning on M-f is an example.
-;; But 'forward-page is orthodoxily bound to C-x ], so moving forward through
+;; But 'forward-page is orthodoxly bound to C-x ], so moving forward through
 ;; several pages requires
 ;;   Loop until desired page is reached:
 ;;     Hold down control key with left pinkie.
@@ -124,7 +123,9 @@ if `repeat' is bound to C-x z, typing C-x z z z repeats the previous command
 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)
+  :type '(choice (const :tag "Repeat for all keys" t)
+		 (const :tag "Don't repeat" nil)
+		 (sexp :tag "Repeat for specific keys")))
 
 ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;;
 
@@ -335,7 +336,12 @@ recently executed command not bound to an input event\"."
 	(setq real-last-command 'repeat)
 	(setq repeat-undo-count 1)
 	(unwind-protect
-	    (while (eq (read-event) repeat-repeat-char)
+	    (while (let ((evt (read-key)))
+                     ;; For clicks, we need to strip the meta-data to
+                     ;; check the underlying event name.
+                     (eq (or (car-safe evt) evt)
+                         (or (car-safe repeat-repeat-char)
+                             repeat-repeat-char)))
 	      (repeat repeat-arg))
 	  ;; Make sure `repeat-undo-count' is reset.
 	  (setq repeat-undo-count nil))
@@ -357,7 +363,7 @@ recently executed command not bound to an input event\"."
 
 ;; OK, there's one situation left where that doesn't work correctly: when the
 ;; most recent self-insertion provoked an auto-fill.  The problem is that
-;; unravelling the undo information after an auto-fill is too hard, since all
+;; unraveling the undo information after an auto-fill is too hard, since all
 ;; kinds of stuff can get in there as a result of comment prefixes etc.  It'd
 ;; be possible to advise do-auto-fill to record the most recent
 ;; self-insertion before it does its thing, but that's a performance hit on
@@ -387,5 +393,4 @@ recently executed command not bound to an input event\"."
 
 (provide 'repeat)
 
-;; arch-tag: cd569600-a1ad-4fa7-9062-bb91dfeaf1db
 ;;; repeat.el ends here