[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99862: * lisp/subr.el (read-quoted-char): Fix up last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 99862
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-06-16 23:37:13 -0400
message:
  * lisp/subr.el (read-quoted-char): Fix up last change.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-16 20:00:22 +0000
+++ b/lisp/ChangeLog    2010-06-17 03:37:13 +0000
@@ -1,3 +1,7 @@
+2010-06-17  Stefan Monnier  <address@hidden>
+
+       * subr.el (read-quoted-char): Fix up last change (bug#6290).
+
 2010-06-16  Stefan Monnier  <address@hidden>
 
        * font-lock.el (font-lock-major-mode): Rename from

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-05-31 14:11:18 +0000
+++ b/lisp/subr.el      2010-06-17 03:37:13 +0000
@@ -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)