diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-27 10:36:07 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-27 10:36:07 -0400 |
| commit | 0da7d35c6754b44d1ef4383e4a8ba9b98afc3a4c (patch) | |
| tree | 595739322d184cdd41ccb88dabe48ed3c89dd559 | |
| parent | c435f506a1fd8fbf2bd22f59226ef296a3eb6ab3 (diff) | |
* lisp/register.el (register-read-with-preview): Don't burp on
frame switches (e.g. due to the frame we just popped).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/register.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 080e11ad01..2658fc0554 100644 --- 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 1c64a9a8e6..6a5792caf1 100644 --- 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))) |