# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1274214704 14400
# Node ID fe3c5134447261cc581d9792e37537a05af5ebdd
# Parent  131cc6db31f4d5e48e4630bbc1f26d17be96a6c2
* subr.el (read-quoted-char): Resolve modifiers after key remapping.

diff -r 131cc6db31f4 -r fe3c51344472 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue May 18 21:43:04 2010 +0200
+++ b/lisp/ChangeLog	Tue May 18 16:31:44 2010 -0400
@@ -1,3 +1,8 @@
+2010-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* subr.el (read-quoted-char): Resolve modifiers after key
+	remapping (bug#6212).
+
 2010-05-18  Michael Albinus  <michael.albinus@gmx.de>
 
 	Add visualization code for secrets.
diff -r 131cc6db31f4 -r fe3c51344472 lisp/subr.el
--- a/lisp/subr.el	Tue May 18 21:43:04 2010 +0200
+++ b/lisp/subr.el	Tue May 18 16:31:44 2010 -0400
@@ -1868,16 +1868,14 @@
 	(if inhibit-quit (setq quit-flag nil)))
       ;; Translate TAB key into control-I ASCII character, and so on.
       ;; Note: `read-char' does it using the `ascii-character' property.
-      ;; We could try and use read-key-sequence instead, but then C-q ESC
-      ;; or C-q C-x might not return immediately since ESC or C-x might be
-      ;; bound to some prefix in function-key-map or key-translation-map.
+      ;; 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))
-      (let ((translation (lookup-key local-function-key-map (vector char))))
-	(if (arrayp translation)
-	    (setq translated (aref translation 0))))
       (cond ((null translated))
 	    ((not (integerp translated))
 	     (setq unread-command-events (list char)