comparison lisp/subr.el @ 108835:2f74da21b147

Fix for momentary-string-display (Bug#6238). * lisp/subr.el (momentary-string-display): Just use read-event to read the exit event (Bug#6238).

108834:91c7e7b1d29a

            ;; If the string end is off screen, recenter now.
            (if (<= (window-end nil t) pos)
                (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))))))
      (delete-overlay ol))))


;;;; Overlay operations

108835:2f74da21b147

            ;; If the string end is off screen, recenter now.
            (if (<= (window-end nil t) pos)
                (recenter (/ (window-height) 2))))
          (message (or message "Type %s to continue editing.")
                   (single-key-description exit-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))))


;;;; Overlay operations