Mercurial > emacs
changeset 108661:0706b3de1aa0
Stefan Monnier <monnier@iro.umontreal.ca>
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 18 May 2010 16:51:12 -0400 |
| parents | c3fda38a8b8b |
| children | 30ebb77362b6 |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue May 18 14:01:10 2010 -0400 +++ b/lisp/ChangeLog Tue May 18 16:51:12 2010 -0400 @@ -1,3 +1,8 @@ +2010-05-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * subr.el (read-quoted-char): Resolve modifiers after key + remapping (bug#6212). + 2010-05-11 Stefan Monnier <monnier@iro.umontreal.ca> * tmm.el (tmm-prompt): Don't try to precompute bindings.
--- a/lisp/subr.el Tue May 18 14:01:10 2010 -0400 +++ b/lisp/subr.el Tue May 18 16:51:12 2010 -0400 @@ -1871,16 +1871,14 @@ (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)