From: Juri Linkov <juri@jurta.org>
Date: Fri, 28 Oct 2005 05:47:31 +0000 (+0000)
Subject: (quail-get-current-str): Translate last raw character
X-Git-Tag: emacs-pretest-22.0.90~6253
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91a802b0bf87fd4d81f3488740e6eea54dac13f5;p=emacs.git

(quail-get-current-str): Translate last raw character
for deterministic input methods.
---

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index e706a26d641..3998764957e 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1598,13 +1598,21 @@ Quail map for the sequence."
   (or (and (consp def) (aref (cdr def) (car (car def))))
       def
       (and (> len 1)
-	   (let ((str (quail-get-current-str
-		       (1- len)
-		       (quail-map-definition (quail-lookup-key
-					      quail-current-key (1- len))))))
+	   (let* ((str (quail-get-current-str
+			(1- len)
+			(quail-map-definition (quail-lookup-key
+					       quail-current-key (1- len)))))
+		  (substr1 (substring quail-current-key (1- len) len))
+		  (str1 (and (quail-deterministic)
+			     (quail-get-current-str
+			      1
+			      (quail-map-definition (quail-lookup-key
+						     substr1 1))))))
 	     (if str
 		 (concat (if (stringp str) str (char-to-string str))
-			 (substring quail-current-key (1- len) len)))))))
+			 (if str1
+			     (if (stringp str1) str1 (char-to-string str1))
+			   substr1)))))))
 
 (defvar quail-guidance-translations-starting-column 20)