Mercurial > emacs

diff lisp/subr.el @ 109242:b36e6aac8cf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 e3df298f4131
children 60516122d066 0266442adf6a
line wrap: on
line diff
--- 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)