aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2002-09-07 22:50:58 +0000
committerKim F. Storm2002-09-07 22:50:58 +0000
commit177aef40f08c8fef9dd8fb9005a4f5745e519713 (patch)
tree6476afa9098fd5b3649b09b3d20e02adb314dc73
parent125c1081478a4eed885b8bdcb6b172408a76a9b3 (diff)
downloademacs-177aef40f08c8fef9dd8fb9005a4f5745e519713.tar.gz
emacs-177aef40f08c8fef9dd8fb9005a4f5745e519713.zip
(read-quoted-char): Apply listify-key-sequence to vector
returned by this-single-command-raw-keys before appending it to unread-command-event.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/subr.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f8cb476b30..bc3d7dad03d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12002-09-08 Kim F. Storm <storm@cua.dk>
2
3 * subr.el (read-quoted-char): Apply listify-key-sequence to vector
4 returned by this-single-command-raw-keys before appending it to
5 unread-command-event.
6
12002-09-07 Colin Walters <walters@debian.org> 72002-09-07 Colin Walters <walters@debian.org>
2 8
3 * progmodes/compile.el (compile-internal): Add optional argument 9 * progmodes/compile.el (compile-internal): Add optional argument
diff --git a/lisp/subr.el b/lisp/subr.el
index 76304358601..4d1d1b350ec 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1092,7 +1092,7 @@ any other non-digit terminates the character code and is then used as input."))
1092 (if inhibit-quit (setq quit-flag nil))) 1092 (if inhibit-quit (setq quit-flag nil)))
1093 (cond ((null char)) 1093 (cond ((null char))
1094 ((not (integerp char)) 1094 ((not (integerp char))
1095 (setq unread-command-events (this-single-command-raw-keys) 1095 (setq unread-command-events (listify-key-sequence (this-single-command-raw-keys))
1096 done t)) 1096 done t))
1097 ((/= (logand char ?\M-\^@) 0) 1097 ((/= (logand char ?\M-\^@) 0)
1098 ;; Turn a meta-character into a character with the 0200 bit set. 1098 ;; Turn a meta-character into a character with the 0200 bit set.
@@ -1109,7 +1109,7 @@ any other non-digit terminates the character code and is then used as input."))
1109 ((and (not first) (eq char ?\C-m)) 1109 ((and (not first) (eq char ?\C-m))
1110 (setq done t)) 1110 (setq done t))
1111 ((not first) 1111 ((not first)
1112 (setq unread-command-events (this-single-command-raw-keys) 1112 (setq unread-command-events (listify-key-sequence (this-single-command-raw-keys))
1113 done t)) 1113 done t))
1114 (t (setq code char 1114 (t (setq code char
1115 done t))) 1115 done t)))