Mercurial > emacs
changeset 109242:b36e6aac8cf2
* lisp/subr.el (read-quoted-char): Fix up last change.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 16 Jun 2010 23:37:13 -0400 |
| parents | c8808b7a8fb4 |
| children | dd13b05d504e |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 17 01:52:13 2010 +0200 +++ b/lisp/ChangeLog Wed Jun 16 23:37:13 2010 -0400 @@ -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
--- a/lisp/subr.el Thu Jun 17 01:52:13 2010 +0200 +++ b/lisp/subr.el Wed Jun 16 23:37:13 2010 -0400 @@ -1873,12 +1873,11 @@ ;; 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)