From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 17 Jun 2010 03:37:13 +0000 (-0400)
Subject: * lisp/subr.el (read-quoted-char): Fix up last change.
X-Git-Tag: emacs-pretest-23.2.90~139^2~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8add347beee7e7ef6b81f9d30ae4e6c46c56930;p=emacs.git

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

Fixes: debbugs:6290
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e24d87f085..93fd4cd8c54 100644
--- 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 59e00bfbeb2..16ea5b41342 100644
--- 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)