[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99822: Fix for momentary-string-display (Bug#6238).

[Chong Yidong]

------------------------------------------------------------
revno: 99822
author: Juanma Barranquero  <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-05-31 10:11:18 -0400
message:
  Fix for momentary-string-display (Bug#6238).
  
  * lisp/subr.el (momentary-string-display): Just use read-event to read
  the exit event (Bug#6238).
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-29 18:22:18 +0000
+++ b/lisp/ChangeLog    2010-05-31 14:11:18 +0000
@@ -1,3 +1,8 @@
+2010-05-31  Juanma Barranquero  <address@hidden>
+
+       * subr.el (momentary-string-display): Just use read-event to read
+       the exit event (Bug#6238).
+
 2010-05-29  Chong Yidong  <address@hidden>
 
        * ansi-color.el: Delete unused escape sequences (Bug#6085).

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-05-18 20:51:12 +0000
+++ b/lisp/subr.el      2010-05-31 14:11:18 +0000
@@ -2207,22 +2207,11 @@
                 (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))))