From 278847cd9230346c8cc210b79a21acaf28f0fb62 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 18 May 2010 16:31:44 -0400 Subject: [PATCH] * subr.el (read-quoted-char): Resolve modifiers after key remapping. Fixes: debbugs:6212 --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c7359caf46..0130fb063e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-05-18 Stefan Monnier + + * subr.el (read-quoted-char): Resolve modifiers after key + remapping (bug#6212). + 2010-05-18 Michael Albinus Add visualization code for secrets. diff --git a/lisp/subr.el b/lisp/subr.el index 1c399f89b9c..fb84f95c805 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1868,16 +1868,14 @@ any other non-digit terminates the character code and is then used as input.")) (if inhibit-quit (setq quit-flag nil))) ;; Translate TAB key into control-I ASCII character, and so on. ;; Note: `read-char' does it using the `ascii-character' property. - ;; We could try and use read-key-sequence instead, but then C-q ESC - ;; or C-q C-x might not return immediately since ESC or C-x might be - ;; bound to some prefix in function-key-map or key-translation-map. + ;; We should try and use read-key instead. + (let ((translation (lookup-key local-function-key-map (vector char)))) + (if (arrayp translation) + (setq translated (aref translation 0)))) (setq translated (if (integerp char) (char-resolve-modifiers char) char)) - (let ((translation (lookup-key local-function-key-map (vector char)))) - (if (arrayp translation) - (setq translated (aref translation 0)))) (cond ((null translated)) ((not (integerp translated)) (setq unread-command-events (list char) -- 2.39.2