comparison lisp/subr.el @ 109242:b36e6aac8cf2

* 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
comparison
equal deleted inserted replaced
109241:c8808b7a8fb4 109242:b36e6aac8cf2
1871 (if inhibit-quit (setq quit-flag nil))) 1871 (if inhibit-quit (setq quit-flag nil)))
1872 ;; Translate TAB key into control-I ASCII character, and so on. 1872 ;; Translate TAB key into control-I ASCII character, and so on.
1873 ;; Note: `read-char' does it using the `ascii-character' property. 1873 ;; Note: `read-char' does it using the `ascii-character' property.
1874 ;; We should try and use read-key instead. 1874 ;; We should try and use read-key instead.
1875 (let ((translation (lookup-key local-function-key-map (vector char)))) 1875 (let ((translation (lookup-key local-function-key-map (vector char))))
1876 (if (arrayp translation) 1876 (setq translated (if (arrayp translation)
1877 (setq translated (aref translation 0)))) 1877 (aref translation 0)
1878 (setq translated 1878 char)))
1879 (if (integerp char) 1879 (if (integerp translated)
1880 (char-resolve-modifiers char) 1880 (setq translated (char-resolve-modifiers translated)))
1881 char))
1882 (cond ((null translated)) 1881 (cond ((null translated))
1883 ((not (integerp translated)) 1882 ((not (integerp translated))
1884 (setq unread-command-events (list char) 1883 (setq unread-command-events (list char)
1885 done t)) 1884 done t))
1886 ((/= (logand translated ?\M-\^@) 0) 1885 ((/= (logand translated ?\M-\^@) 0)