comparison lisp/international/quail.el @ 29326:44c929164604

(quail-start-conversion): Don't include unhandled events in the returned events, but set them in unread-command-events. Exit if all inputs are deleted.
author Kenichi Handa <handa@m17n.org>
date Wed, 31 May 2000 03:49:49 +0000
parents 79b2b42f9a7b
children a81355bcaaeb
comparison
equal deleted inserted replaced
29325:e67ef9cdfe51 29326:44c929164604
1063 (setq quail-conversion-str 1063 (setq quail-conversion-str
1064 (concat quail-conversion-str 1064 (concat quail-conversion-str
1065 (if (stringp quail-current-str) 1065 (if (stringp quail-current-str)
1066 quail-current-str 1066 quail-current-str
1067 (char-to-string quail-current-str))))) 1067 (char-to-string quail-current-str)))))
1068 (if input-method-exit-on-first-char 1068 (if (or input-method-exit-on-first-char
1069 (= (length quail-conversion-str) 0))
1069 (setq quail-converting nil))))) 1070 (setq quail-converting nil)))))
1070 ;; KEYSEQ is not defined in the conversion keymap. 1071 ;; KEYSEQ is not defined in the conversion keymap.
1071 ;; Let's return the event(s) to the caller. 1072 ;; Let's return the event(s) to the caller.
1072 (setq generated-events 1073 (setq unread-command-events
1073 (string-to-list (this-single-command-raw-keys))) 1074 (string-to-list (this-single-command-raw-keys)))
1074 (setq quail-converting nil)))) 1075 (setq quail-converting nil))))
1075 (if (overlay-start quail-conv-overlay) 1076 (if (overlay-start quail-conv-overlay)
1076 (delete-region (overlay-start quail-conv-overlay) 1077 (delete-region (overlay-start quail-conv-overlay)
1077 (overlay-end quail-conv-overlay))) 1078 (overlay-end quail-conv-overlay)))
1078 (if (> (length quail-conversion-str) 0) 1079 (if (> (length quail-conversion-str) 0)
1079 (setq generated-events 1080 (setq generated-events
1080 (append (string-to-list 1081 (string-to-list
1081 (if enable-multibyte-characters 1082 (if enable-multibyte-characters
1082 quail-conversion-str 1083 quail-conversion-str
1083 (string-make-unibyte quail-conversion-str))) 1084 (string-make-unibyte quail-conversion-str)))))
1084 generated-events)))
1085 (if (and input-method-exit-on-first-char generated-events) 1085 (if (and input-method-exit-on-first-char generated-events)
1086 (list (car generated-events)) 1086 (list (car generated-events))
1087 generated-events)) 1087 generated-events))
1088 1088
1089 ;; Since KEY doesn't start any translation, just return it. 1089 ;; Since KEY doesn't start any translation, just return it.