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

Fixes: debbugs:6290

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e24d87f085950b9ab09743dd0da81d53c80969d..93fd4cd8c547eed6fba61e9fd499b3109ddc2984 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/subr.el b/lisp/subr.el
index 59e00bfbeb291fe9347caf151568d10ea5ba6a65..16ea5b41342a48e96b47c1b14d2f8d08d53cc0ca 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -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)