summaryrefslogtreecommitdiff
path: root/lisp/international
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>1998-07-23 05:42:28 +0000
committerKenichi Handa <handa@m17n.org>1998-07-23 05:42:28 +0000
commitda55ad08c20355b5102a05530d0d5e28a6d54fe6 (patch)
tree7d4aad7096b18a3958a6f624ff053fd2d7b78c5e /lisp/international
parent37aa9115b75a31fdf64b5ed784d0b358014b8d54 (diff)
downloademacs-da55ad08c20355b5102a05530d0d5e28a6d54fe6.tar.gz
(quail-start-translation): Use
this-single-command-keys to get raw events instead of listify-key-sequence (quail-start-conversion): Likewise.
Diffstat (limited to 'lisp/international')
-rw-r--r--lisp/international/quail.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 6fbd8324185..9f9cf9c4405 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -903,11 +903,11 @@ The returned value is a Quail map specific to KEY."
(while quail-translating
(let* ((echo-keystrokes 0)
(keyseq (read-key-sequence nil))
- (events (listify-key-sequence keyseq))
+ (events (this-single-command-keys))
(cmd (lookup-key translation-keymap keyseq)))
(if (commandp cmd)
(progn
- (setq last-command-event (car (last events))
+ (setq last-command-event (aref events (1- (length events)))
last-command this-command
this-command cmd)
(condition-case err
@@ -915,7 +915,7 @@ The returned value is a Quail map specific to KEY."
(quail-error (message "%s" (cdr err)) (beep))))
;; KEYSEQ is not defined in the translation keymap.
;; Let's return the event(s) to the caller.
- (setq generated-events events
+ (setq generated-events (string-to-list events)
quail-translating nil))))
(if (overlay-start quail-overlay)
(setq generated-events
@@ -951,11 +951,11 @@ The returned value is a Quail map specific to KEY."
(quail-setup-overlays nil)))
(let* ((echo-keystrokes 0)
(keyseq (read-key-sequence nil))
- (events (listify-key-sequence keyseq))
+ (events (this-single-command-keys))
(cmd (lookup-key conversion-keymap keyseq)))
(if (commandp cmd)
(progn
- (setq last-command-event (car (last events))
+ (setq last-command-event (aref events (1- (length events)))
last-command this-command
this-command cmd)
(condition-case err
@@ -963,7 +963,7 @@ The returned value is a Quail map specific to KEY."
(quail-error (message "%s" (cdr err)) (beep))))
;; KEYSEQ is not defined in the conversion keymap.
;; Let's return the event(s) to the caller.
- (setq generated-events events
+ (setq generated-events (string-to-list events)
quail-converting nil))))
(if (overlay-start quail-conv-overlay)
(setq generated-events