diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-18 16:31:44 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-18 16:31:44 -0400 |
| commit | 278847cd9230346c8cc210b79a21acaf28f0fb62 (patch) | |
| tree | 89354524d45620cfde7d6f900ce15af37eef0cf9 /lisp/subr.el | |
| parent | 065f2743178d57f269bca6888c80b115fb76c362 (diff) | |
| download | emacs-278847cd9230346c8cc210b79a21acaf28f0fb62.tar.gz | |
* subr.el (read-quoted-char): Resolve modifiers after key remapping.
Fixes: debbugs:6212
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 10 |
1 files changed, 4 insertions, 6 deletions
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) |