(quail-tibetan-input-wylie): Adjusted for the

change of input method handling.
(quail-tibetan-input-tibkey): Likewise.

diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index 00f7b1ed489619c34b367a4e465c10633df58a10..b6563d31b1dfa1e8538f1465b718aca340514daf 100644 (file)
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -75,10 +75,15 @@
   (let (pc)
     (quail-delete-region)
     (quail-delete-overlays)
-    (setq pc (preceding-char))
-    (if (not (eq (point) (point-min)))
-       (delete-backward-char 1 nil))
-    (insert (tibetan-composition pc key))
+    (setq pc (char-before (overlay-start quail-overlay))
+         quail-current-str (tibetan-composition pc key))
+    (if (not (bobp))
+       (progn
+         (delete-char -1)
+         (insert (aref quail-current-str 0))
+         (setq quail-current-str (substring quail-current-str 1))))
+    (move-overlay quail-overlay (point) (point))
+    (insert quail-current-str)
     (throw 'quail-tag nil)))
 
 
@@ -86,21 +91,21 @@
 "Tibetan character input by Extended Wylie key assignment.
 
     +-------------------------------------+
-    |\e2\e$(7"!`#T\e1\e$(8!;\e(B k |\e2\e$(7""`#T\e1\e$(8!;\e(B kh |\e2\e$(7"#`#T\e1\e$(8!;\e(B g  |\e2\e$(7"$`#T\e1\e$(8!;\e(B gh |\e2\e$(7"%`#T\e1\e$(8!;\e(B ng|   \e$(7"S\e(B i          \e$(8!=\e(B        /
-    |\e2\e$(7"&`#T\e1\e$(8!;\e(B c |\e2\e$(7"'`#T\e1\e$(8!;\e(B ch |\e2\e$(7"(`#T\e1\e$(8!;\e(B j  |       |\e$(7"*\e$(8!;\e(B ny|   \e$(7"U\e(B u          \e$(7!>\e(B       //
-    |\e$(7"+\e$(8!;\e(B T |\e$(7",\e$(8!;\e(B TH |\e$(7"-\e$(8!;\e(B D  |\e$(7".\e$(8!;\e(B DH |\e$(7"/\e$(8!;\e(B N |   \e$(7"[\e(B e          \e2\e$(7!>P\e(B P\e$(7!>\e1\e(B    ////
+    |\e2\e$(7"!`#T\e(B\e1\e$(8!;\e(B k |\e2\e$(7""`#T\e(B\e1\e$(8!;\e(B kh |\e2\e$(7"#`#T\e(B\e1\e$(8!;\e(B g  |\e2\e$(7"$`#T\e(B\e1\e$(8!;\e(B gh |\e2\e$(7"%`#T\e(B\e1\e$(8!;\e(B ng|   \e$(7"S\e(B i          \e$(8!=\e(B        /
+    |\e2\e$(7"&`#T\e(B\e1\e$(8!;\e(B c |\e2\e$(7"'`#T\e(B\e1\e$(8!;\e(B ch |\e2\e$(7"(`#T\e(B\e1\e$(8!;\e(B j  |       |\e$(7"*\e$(8!;\e(B ny|   \e$(7"U\e(B u          \e$(7!>\e(B       //
+    |\e$(7"+\e$(8!;\e(B T |\e$(7",\e$(8!;\e(B TH |\e$(7"-\e$(8!;\e(B D  |\e$(7".\e$(8!;\e(B DH |\e$(7"/\e$(8!;\e(B N |   \e$(7"[\e(B e          \e2\e$(7!>P\e(B P\e$(7!>\e(B\e1    ////
     |\e$(7"0\e$(8!;\e(B t |\e$(7"1\e$(8!;\e(B th |\e$(7"2\e$(8!;\e(B d  |\e$(7"3\e$(8!;\e(B dh |\e$(7"4\e$(8!;\e(B n |   \e$(7"]\e(B o          \e$(7!A\e(B       ;
     |\e$(7"5\e$(8!;\e(B p |\e$(7"6\e$(8!;\e(B ph |\e$(7"7\e$(8!;\e(B b  |\e$(7"8\e$(8!;\e(B bh |\e$(7"9\e$(8!;\e(B m |   \e$(7"\\e(B ai (ee, E) \e$(8!?\e(B        $
     |\e$(7":\e$(8!;\e(B ts|\e$(7";\e$(8!;\e(B tsh|\e$(7"<\e$(8!;\e(B dz |\e$(7"=\e$(8!;\e(B dzh|\e$(7">\e$(8!;\e(B w |   \e$(7"^\e(B au (oo, O) \e$(8!@\e(B        &
-    |\e$(7"?\e$(8!;\e(B zh|\e$(7"@\e$(8!;\e(B z  |\e$(7"A\e$(8!;\e(B '  |       |\e$(7"B\e$(8!;\e(B y |   \e$(7"a\e(B I          \e2\e$(7#RP#SP#S\e1\e(B   *
-    |\e$(7"C\e$(8!;\e(B r |\e$(7"D\e$(8!;\e(B l  |\e$(7"E\e$(8!;\e(B sh |\e$(7"F\e$(8!;\e(B SH |\e$(7"G\e$(8!;\e(B s |   \e$(7"`\e(B :          \e2\e$(7#RP#SP#SP#S\e1\e(B #
+    |\e$(7"?\e$(8!;\e(B zh|\e$(7"@\e$(8!;\e(B z  |\e$(7"A\e$(8!;\e(B '  |       |\e$(7"B\e$(8!;\e(B y |   \e$(7"a\e(B I          \e2\e$(7#RP#SP#S\e(B\e1   *
+    |\e$(7"C\e$(8!;\e(B r |\e$(7"D\e$(8!;\e(B l  |\e$(7"E\e$(8!;\e(B sh |\e$(7"F\e$(8!;\e(B SH |\e$(7"G\e$(8!;\e(B s |   \e$(7"`\e(B :          \e2\e$(7#RP#SP#SP#S\e(B\e1 #
     |\e$(7"H\e$(8!;\e(B h |\e$(7"I\e$(8!;\e(B A  |\e$(7"J\e$(8!;\e(B kSH|       |      |   \e$(7"_\e(B M           \e$(7!l\e(B \e$(7!m\e(B   < >
     +-------------------------------------+   \e$(8!D\e(B  %
     (The consonant \e$(7"I\e$(8!;\e(B must be typed explicitly.)
 
   NOT SPECIFIED IN EXT. WYLIE:
     +--------------------------------------------------------+
-    |\e$(7"c\e(B = ~ |\e$(7"d\e(B = ` |\e$(7"e\e(B = , |\e$(7"f\e(B = @ |\e$(7!g\e(B = _o|\e$(7!e\e(B = _O|\e2\e$(7#RP#S_!I\e1\e(B = ^|
+    |\e$(7"c\e(B = ~ |\e$(7"d\e(B = ` |\e$(7"e\e(B = , |\e$(7"f\e(B = @ |\e$(7!g\e(B = _o|\e$(7!e\e(B = _O|\e2\e$(7#RP#S_!I\e(B\e1 = ^|
     +--------------------------------------------------------+
     |\e$(7"i\e(B = x |\e$(7"j\e(B = X |\e$(7"g\e(B = v |\e$(7"h\e(B = V |\e$(7"k\e(B = q |\e$(7"l\e(B = Q |
     +-----------------------------------------------+
@@ -331,10 +336,15 @@
     (setq trans (cdr (assoc key tibetan-tibkey-to-transcription-alist)))
     (quail-delete-region)
     (quail-delete-overlays)
-    (setq pc (preceding-char))
-    (if (not (eq (point) (point-min)))
-       (delete-backward-char 1 nil))
-    (insert (tibetan-composition pc trans))
+    (setq pc (char-before (overlay-start quail-overlay))
+         quail-current-str (tibetan-composition pc trans))
+    (if (not (bobp))
+       (progn
+         (delete-char -1)
+         (insert (aref quail-current-str 0))
+         (setq quail-current-str (substring quail-current-str 1))))
+    (move-overlay quail-overlay (point) (point))
+    (insert quail-current-str)
     (throw 'quail-tag nil)))
 
 
@@ -361,7 +371,7 @@
   [SHIFTED]
 
   +----------------------------------------------------------+
-  |~\e$(7"c\e(B|!\e2\e$(7#RP#S\e1\e(B|@\e$(7#S\e(B|#  |$  |%\e$(8!D\e(B |^\e$(7!1\e(B|&  |*  |(\e$(7!l\e(B|)\e$(7!m\e(B|_  |+\e$(7!A\e(B| |\e$(7!8\e(B|
+  |~\e$(7"c\e(B|!\e2\e$(7#RP#S\e(B\e1|@\e$(7#S\e(B|#  |$  |%\e$(8!D\e(B |^\e$(7!1\e(B|&  |*  |(\e$(7!l\e(B|)\e$(7!m\e(B|_  |+\e$(7!A\e(B| |\e$(7!8\e(B|
   +----------------------------------------------------------+
      |Q\e$(7"J\e(B|W\e$(7#T\e(B|E  |R  |T\e$(7"a\e(B|Y  |U  |I\e$(7"f\e(B|O\e$(7"+\e(B|P\e$(7",\e(B|{\e$(7"-\e(B|}\e$(7"/\e(B|
      +-----------------------------------------------+