diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-05-31 10:11:18 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-05-31 10:11:18 -0400 |
| commit | 450439d5b6c08f0001f6676a697f29d88f587b98 (patch) | |
| tree | b0c1eb2357a11d1288f4079988a04ee23057bf8f /lisp | |
| parent | a73f9c9dfdcf6be0ca39e87e6d98f1094158ff9f (diff) | |
| download | emacs-450439d5b6c08f0001f6676a697f29d88f587b98.tar.gz emacs-450439d5b6c08f0001f6676a697f29d88f587b98.tar.bz2 emacs-450439d5b6c08f0001f6676a697f29d88f587b98.zip | |
Fix for momentary-string-display (Bug#6238).
* lisp/subr.el (momentary-string-display): Just use read-event to read
the exit event (Bug#6238).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 21 |
2 files changed, 10 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34a494aa5f2..f668922cb5c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-05-31 Juanma Barranquero <lekktu@gmail.com> + + * subr.el (momentary-string-display): Just use read-event to read + the exit event (Bug#6238). + 2010-05-29 Chong Yidong <cyd@stupidchicken.com> * ansi-color.el: Delete unused escape sequences (Bug#6085). diff --git a/lisp/subr.el b/lisp/subr.el index e964a0ef5d4..59e00bfbeb2 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2207,22 +2207,11 @@ If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there." (recenter (/ (window-height) 2)))) (message (or message "Type %s to continue editing.") (single-key-description exit-char)) - (let (char) - (if (integerp exit-char) - (condition-case nil - (progn - (setq char (read-char)) - (or (eq char exit-char) - (setq unread-command-events (list char)))) - (error - ;; `exit-char' is a character, hence it differs - ;; from char, which is an event. - (setq unread-command-events (list char)))) - ;; `exit-char' can be an event, or an event description list. - (setq char (read-event)) - (or (eq char exit-char) - (eq char (event-convert-list exit-char)) - (setq unread-command-events (list char)))))) + (let ((event (read-event))) + ;; `exit-char' can be an event, or an event description list. + (or (eq event exit-char) + (eq event (event-convert-list exit-char)) + (setq unread-command-events (list event))))) (delete-overlay ol)))) |