Commit fe40dc63 authored by Juanma Barranquero's avatar Juanma Barranquero Committed by Chong Yidong
Browse files

Fix for momentary-string-display (Bug#6238).

* lisp/subr.el (momentary-string-display): Just use read-event to read
the exit event (Bug#6238).
parent 9e8014c6
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-30 Eli Zaretskii <eliz@gnu.org>
 
* international/mule.el (define-coding-system): Doc fix (bug#6313).
......
......@@ -2204,22 +2204,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))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment