summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/rmc.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp/rmc.el')
-rw-r--r--lisp/emacs-lisp/rmc.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index 27e5d6c612b..158c1e857cc 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -191,7 +191,7 @@ Usage example:
(format
"%s (%s): "
prompt
- (mapconcat (lambda (e) (cdr e)) altered-names ", ")))
+ (mapconcat #'cdr altered-names ", ")))
tchar buf wrong-char answer command)
(save-window-excursion
(save-excursion
@@ -216,8 +216,14 @@ Usage example:
(car elem)))
prompt-choices)))
(condition-case nil
- (let ((cursor-in-echo-area t))
- (read-event))
+ (let ((cursor-in-echo-area t)
+ ;; Do NOT use read-event here. That
+ ;; function does not consult
+ ;; input-decode-map (bug#75886).
+ (key (read-key)))
+ (when (eq key ?\C-g)
+ (signal 'quit nil))
+ key)
(error nil))))
(if (memq (car-safe tchar) '(touchscreen-begin
touchscreen-end