HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge emacs-23
[bpt/emacs.git]
/
lisp
/
repeat.el
diff --git
a/lisp/repeat.el
b/lisp/repeat.el
index
452da94
..
9abe15c
100644
(file)
--- a/
lisp/repeat.el
+++ b/
lisp/repeat.el
@@
-1,7
+1,7
@@
;;; repeat.el --- convenient way to repeat the previous command
;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
;;; repeat.el --- convenient way to repeat the previous command
;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2006, 2007, 2008
, 2009, 2010
Free Software Foundation, Inc.
;; Author: Will Mengarini <seldon@eskimo.com>
;; Created: Mo 02 Mar 98
;; Author: Will Mengarini <seldon@eskimo.com>
;; Created: Mo 02 Mar 98
@@
-10,10
+10,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-21,9
+21,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-102,9
+100,9
@@
:type '(repeat function))
;; If the last command was self-insert-command, the char to be inserted was
:type '(repeat function))
;; If the last command was self-insert-command, the char to be inserted was
-;; obtained by that command from last-command-
char
, which has now been
+;; obtained by that command from last-command-
event
, which has now been
;; clobbered by the command sequence that invoked `repeat'. We could get it
;; clobbered by the command sequence that invoked `repeat'. We could get it
-;; from (recent-keys) & set last-command-
char
to that, "unclobbering" it, but
+;; from (recent-keys) & set last-command-
event
to that, "unclobbering" it, but
;; this has the disadvantage that if the user types a sequence of different
;; chars then invokes repeat, only the final char will be inserted. In vi,
;; the dot command can reinsert the entire most-recently-inserted sequence.
;; this has the disadvantage that if the user types a sequence of different
;; chars then invokes repeat, only the final char will be inserted. In vi,
;; the dot command can reinsert the entire most-recently-inserted sequence.
@@
-249,14
+247,14
@@
recently executed command not bound to an input event\"."
(setq repeat-arg last-prefix-arg))
;; Now determine whether to loop on repeated taps of the final character
;; of the key sequence that invoked repeat. The Emacs global
(setq repeat-arg last-prefix-arg))
;; Now determine whether to loop on repeated taps of the final character
;; of the key sequence that invoked repeat. The Emacs global
- ;; last-command-
char
contains the final character now, but may not still
+ ;; last-command-
event
contains the final character now, but may not still
;; contain it after the previous command is repeated, so the character
;; needs to be saved.
(let ((repeat-repeat-char
(if (eq repeat-on-final-keystroke t)
;; contain it after the previous command is repeated, so the character
;; needs to be saved.
(let ((repeat-repeat-char
(if (eq repeat-on-final-keystroke t)
- last-command-
char
+ last-command-
event
;; allow only specified final keystrokes
;; allow only specified final keystrokes
- (car (memq last-command-
char
+ (car (memq last-command-
event
(listify-key-sequence
repeat-on-final-keystroke))))))
(if (memq last-repeatable-command '(exit-minibuffer
(listify-key-sequence
repeat-on-final-keystroke))))))
(if (memq last-repeatable-command '(exit-minibuffer
@@
-337,7
+335,12
@@
recently executed command not bound to an input event\"."
(setq real-last-command 'repeat)
(setq repeat-undo-count 1)
(unwind-protect
(setq real-last-command 'repeat)
(setq repeat-undo-count 1)
(unwind-protect
- (while (eq (read-event) repeat-repeat-char)
+ (while (let ((evt (read-event))) ;FIXME: read-key maybe?
+ ;; 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))
(repeat repeat-arg))
;; Make sure `repeat-undo-count' is reset.
(setq repeat-undo-count nil))
@@
-346,7
+349,7
@@
recently executed command not bound to an input event\"."
(defun repeat-self-insert (string)
(let ((i 0))
(while (< i (length string))
(defun repeat-self-insert (string)
(let ((i 0))
(while (< i (length string))
- (let ((last-command-
char
(aref string i)))
+ (let ((last-command-
event
(aref string i)))
(self-insert-command 1))
(setq i (1+ i)))))
(self-insert-command 1))
(setq i (1+ i)))))