From: Kenichi Handa <handa@m17n.org>
Date: Fri, 29 Aug 2008 07:59:57 +0000 (+0000)
Subject: Fix setting up of composition-function-table.
X-Git-Tag: emacs-pretest-23.0.90~3161
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4699a15aedf6ee20abee438c84fcabe874a79aa7;p=emacs.git

Fix setting up of composition-function-table.
---

diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index d3e75af965f..b488ee5488f 100644
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -33,7 +33,7 @@
 (set-char-table-range 
  composition-function-table
  '(#xD80 . #xDFF)
- (list (cons "[\xD80-\xDFF\x200C\x200D]+" 'font-shape-text)))
+ (list (vector "[\xD80-\xDFF\x200C\x200D]+" 0 'font-shape-gstring)))
 
 ;; arch-tag: 87b9ad3b-5090-422f-b942-eb85b9d52e7c
 ;; sinhala.el ends here
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 311e3675779..2eb83f32fa6 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -76,10 +76,12 @@ This is the same as `thai-tis620' with the addition of no-break-space."
   :charset-list '(iso-8859-11))
 
 ;; For automatic composition.
-(let ((chars ",TQTUVWXYZghijklmn(B"))
+(let ((chars ",TQTUVWXYZghijklmn(B")
+      (elt '(["[,T!(B-,TO(B].[,Thijkl(B]?,TS(B?" 1 thai-composition-function]
+	     [nil 0 thai-composition-function])))
   (dotimes (i (length chars))
-    (aset composition-function-table (aref chars i)
-	  'thai-composition-function)))
+    (aset composition-function-table (aref chars i) elt)))
+(aset composition-function-table ?,TS(B '(["[,T!(B-,TO(B]." 1 thai-composition-function]))
 
 (provide 'thai)