; Merge from branch 'master'scratch/raeburn-startup

1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/register.el b/lisp/register.el
index 7cc3ccd870c..e395963f56a 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -164,6 +164,10 @@ display such a window regardless."
                        help-chars)
             (unless (get-buffer-window buffer)
               (register-preview buffer 'show-empty)))
+          (when (or (eq ?\C-g last-input-event)
+                    (eq 'escape last-input-event)
+                    (eq ?\C-\[ last-input-event))
+            (keyboard-quit))
           (if (characterp last-input-event) last-input-event
             (error "Non-character input-event")))
       (and (timerp timer) (cancel-timer timer))