[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99808: Stefan Monnier <address@hi
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99808: Stefan Monnier <address@hidden> |
Date: |
Tue, 18 May 2010 16:51:12 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99808
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-05-18 16:51:12 -0400
message:
Stefan Monnier <address@hidden>
modified:
lisp/ChangeLog
lisp/subr.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-05-11 20:07:12 +0000
+++ b/lisp/ChangeLog 2010-05-18 20:51:12 +0000
@@ -1,3 +1,8 @@
+2010-05-18 Stefan Monnier <address@hidden>
+
+ * subr.el (read-quoted-char): Resolve modifiers after key
+ remapping (bug#6212).
+
2010-05-11 Stefan Monnier <address@hidden>
* tmm.el (tmm-prompt): Don't try to precompute bindings.
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2010-03-27 12:31:04 +0000
+++ b/lisp/subr.el 2010-05-18 20:51:12 +0000
@@ -1871,16 +1871,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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99808: Stefan Monnier <address@hidden>,
Chong Yidong <=