Mercurial > emacs
comparison lisp/international/quail.el @ 22802:441f052f49f7
(quail-start-translation): Use
this-single-command-keys to get raw events instead of
listify-key-sequence
(quail-start-conversion): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 23 Jul 1998 05:42:28 +0000 |
| parents | c3ab1de66dfc |
| children | e422c56928d9 |
comparison
equal
deleted
inserted
replaced
| 22801:e71025b5e000 | 22802:441f052f49f7 |
|---|---|
| 901 quail-translating t | 901 quail-translating t |
| 902 unread-command-events (cons key unread-command-events)) | 902 unread-command-events (cons key unread-command-events)) |
| 903 (while quail-translating | 903 (while quail-translating |
| 904 (let* ((echo-keystrokes 0) | 904 (let* ((echo-keystrokes 0) |
| 905 (keyseq (read-key-sequence nil)) | 905 (keyseq (read-key-sequence nil)) |
| 906 (events (listify-key-sequence keyseq)) | 906 (events (this-single-command-keys)) |
| 907 (cmd (lookup-key translation-keymap keyseq))) | 907 (cmd (lookup-key translation-keymap keyseq))) |
| 908 (if (commandp cmd) | 908 (if (commandp cmd) |
| 909 (progn | 909 (progn |
| 910 (setq last-command-event (car (last events)) | 910 (setq last-command-event (aref events (1- (length events))) |
| 911 last-command this-command | 911 last-command this-command |
| 912 this-command cmd) | 912 this-command cmd) |
| 913 (condition-case err | 913 (condition-case err |
| 914 (call-interactively cmd) | 914 (call-interactively cmd) |
| 915 (quail-error (message "%s" (cdr err)) (beep)))) | 915 (quail-error (message "%s" (cdr err)) (beep)))) |
| 916 ;; KEYSEQ is not defined in the translation keymap. | 916 ;; KEYSEQ is not defined in the translation keymap. |
| 917 ;; Let's return the event(s) to the caller. | 917 ;; Let's return the event(s) to the caller. |
| 918 (setq generated-events events | 918 (setq generated-events (string-to-list events) |
| 919 quail-translating nil)))) | 919 quail-translating nil)))) |
| 920 (if (overlay-start quail-overlay) | 920 (if (overlay-start quail-overlay) |
| 921 (setq generated-events | 921 (setq generated-events |
| 922 (append (quail-overlay-region-events quail-overlay) | 922 (append (quail-overlay-region-events quail-overlay) |
| 923 generated-events))) | 923 generated-events))) |
| 949 quail-current-str nil | 949 quail-current-str nil |
| 950 quail-translating t) | 950 quail-translating t) |
| 951 (quail-setup-overlays nil))) | 951 (quail-setup-overlays nil))) |
| 952 (let* ((echo-keystrokes 0) | 952 (let* ((echo-keystrokes 0) |
| 953 (keyseq (read-key-sequence nil)) | 953 (keyseq (read-key-sequence nil)) |
| 954 (events (listify-key-sequence keyseq)) | 954 (events (this-single-command-keys)) |
| 955 (cmd (lookup-key conversion-keymap keyseq))) | 955 (cmd (lookup-key conversion-keymap keyseq))) |
| 956 (if (commandp cmd) | 956 (if (commandp cmd) |
| 957 (progn | 957 (progn |
| 958 (setq last-command-event (car (last events)) | 958 (setq last-command-event (aref events (1- (length events))) |
| 959 last-command this-command | 959 last-command this-command |
| 960 this-command cmd) | 960 this-command cmd) |
| 961 (condition-case err | 961 (condition-case err |
| 962 (call-interactively cmd) | 962 (call-interactively cmd) |
| 963 (quail-error (message "%s" (cdr err)) (beep)))) | 963 (quail-error (message "%s" (cdr err)) (beep)))) |
| 964 ;; KEYSEQ is not defined in the conversion keymap. | 964 ;; KEYSEQ is not defined in the conversion keymap. |
| 965 ;; Let's return the event(s) to the caller. | 965 ;; Let's return the event(s) to the caller. |
| 966 (setq generated-events events | 966 (setq generated-events (string-to-list events) |
| 967 quail-converting nil)))) | 967 quail-converting nil)))) |
| 968 (if (overlay-start quail-conv-overlay) | 968 (if (overlay-start quail-conv-overlay) |
| 969 (setq generated-events | 969 (setq generated-events |
| 970 (append (quail-overlay-region-events quail-conv-overlay) | 970 (append (quail-overlay-region-events quail-conv-overlay) |
| 971 generated-events))) | 971 generated-events))) |