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

* lisp/subr.el (read-quoted-char): Fix up last change.

Browse source 
Fixes: debbugs:6290
This commit is contained in:
Stefan Monnier 2010-06-16 23:37:13 -04:00
parent fee69dc1c0
commit b8add347be
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2010-06-17 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (read-quoted-char): Fix up last change (bug#6290).
2010-06-16 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (font-lock-major-mode): Rename from

11
lisp/subr.el
View file

@ -1873,12 +1873,11 @@ any other non-digit terminates the character code and is then used as input."))
;; Note: `read-char' does it using the `ascii-character' property.
;; 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))
(setq translated (if (arrayp translation)
(aref translation 0)
char)))
(if (integerp translated)
(setq translated (char-resolve-modifiers translated)))
(cond ((null translated))
((not (integerp translated))
(setq unread-command-events (list char)