changeset 31584:a5e682286ab6

(quail-start-translation): Translate KEY if necessary even if it doesn't have any mapping in the current input method. (quail-start-conversion): Likewise. (quail-help): The output message is improved.
author Kenichi Handa <handa@m17n.org>
date Wed, 13 Sep 2000 12:10:29 +0000
parents d147cc8cb658
children e56c4b13af75
files lisp/international/quail.el
diffstat 1 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/quail.el	Wed Sep 13 12:09:56 2000 +0000
+++ b/lisp/international/quail.el	Wed Sep 13 12:10:29 2000 +0000
@@ -1349,6 +1349,10 @@
 	  generated-events))
 
     ;; Since KEY doesn't start any translation, just return it.
+    ;; But, translate KEY if necessary.
+    (if (and (integerp key)
+	     (quail-kbd-translate))
+	(setq key (quail-keyboard-translate key)))
     (list key)))
 
 (defun quail-start-conversion (key)
@@ -1429,6 +1433,10 @@
 	  generated-events))
 
     ;; Since KEY doesn't start any translation, just return it.
+    ;; But, translate KEY if necessary.
+    (if (and (integerp key)
+	     (quail-kbd-translate))
+	(setq key (quail-keyboard-translate key)))
     (list key)))
 
 (defun quail-terminate-translation ()
@@ -2407,17 +2415,19 @@
 	    (insert "
 KEYBOARD LAYOUT
 ---------------
-Physical key layout for this input method is as below.
-You can input a character in the table by typing a key
-at the same location on your keyboard.\n")
+This input method is designed to pretend you are using a keyboard
+with the following \"virtual\" layout:
+")
 	    (setq done-list
 		  (quail-insert-kbd-layout quail-keyboard-layout))
-	    (insert "It is assumed that your keyboard type is `")
+	    (insert "\
+The input method implements that result by assuming you have
+a `")
 	    (help-insert-xref-button
 	     quail-keyboard-layout-type
 	     #'quail-show-keyboard-layout quail-keyboard-layout-type
 	     "mouse-2, RET: show this layout")
-	    (insert "'.
+	    (insert "' keyboard layout, and translating characters accordingly.
 If the layout is different from your keyboard, or you see the
 different characters when you type keys according to this layout,
 adjust the variable `quail-keyboard-layout-type' ")