mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Stefan Monnier <monnier@iro.umontreal.ca>

Browse source
This commit is contained in:
Chong Yidong 2010-05-18 16:51:12 -04:00
parent 754790b6c5
commit 29031d52fe
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

10
lisp/subr.el
View file

@ -1871,16 +1871,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)