* lisp/register.el (register-read-with-preview): Don't burp on

frame switches (e.g. due to the frame we just popped).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 080e11ad01fd1035cd3fe8765d14bf4349c8ba86..2658fc0554d32554e903776a405e5d2eb05fb88d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * register.el (register-read-with-preview): Don't burp on
+       frame switches (e.g. due to the frame we just popped).
+
        * mouse.el (mouse-set-region): Handle spurious drag events (bug#17562).
        (mouse-drag-track): Annotate `mouse-drag-start' so we know we moved.
 

diff --git a/lisp/register.el b/lisp/register.el
index 1c64a9a8e6414d4ccc1eaf47e63c13827311dd4c..6a5792caf1e715cf40d4f51062b9fa6de30c5f48 100644 (file)
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -161,7 +161,7 @@ display such a window regardless."
                              collect c)))
     (unwind-protect
        (progn
-         (while (memq (read-event (propertize prompt 'face 'minibuffer-prompt))
+         (while (memq (read-key (propertize prompt 'face 'minibuffer-prompt))
                       help-chars)
            (unless (get-buffer-window buffer)
              (register-preview buffer 'show-empty)))