From e8b2c620a933b83e12ee4fd812d0ad650a90c3e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Thu, 6 Feb 2025 05:31:38 +0100 Subject: [PATCH] Use read-key in amp-y-or-n-p (bug#75886) * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use read-key so that C-g in recognized when defined in input-decode-map. (cherry picked from commit ea04dd8ca93d609c0ee475c4acf58a56dfc0f1f3) --- lisp/emacs-lisp/map-ynp.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 14cbbfda033..18277b60fb8 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -185,7 +185,12 @@ The function's value is the number of actions taken." (let ((overriding-text-conversion-style nil)) (when (fboundp 'set-text-conversion-style) (set-text-conversion-style text-conversion-style)) - (setq char (read-event))) + ;; Do NOT use read-event here. That + ;; function does not consult + ;; input-decode-map (bug#75886). + (setq char (read-key)) + (when (eq char ?\C-g) + (signal 'quit nil))) (when (fboundp 'set-text-conversion-style) (set-text-conversion-style text-conversion-style))) ;; Show the answer to the question. -- 2.39.5