diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
| commit | 2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch) | |
| tree | 4837c369ac576fbfd063b1ff046a3daca372f082 /lisp/subr.el | |
| parent | c971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff) | |
| parent | 7c33a0572280bdcf0583c5625cfda32f63fad56d (diff) | |
| download | emacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 16ba45f1c74..9fb737fd038 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1874,12 +1874,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) |