Fix setting up of composition-function-table.

diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index d3e75af965f72fbb89065816bf8888002e38b540..b488ee5488f03c120f07bf97e5342cd2f9154231 100644 (file)
--- 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 311e3675779cf5c8c83bd4f257eadfb0ff2dc38f..2eb83f32fa6821716d3c49852bfd16115888b5e5 100644 (file)
--- 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 "\e,TQTUVWXYZghijklmn\e(B"))
+(let ((chars "\e,TQTUVWXYZghijklmn\e(B")
+      (elt '(["[\e,T!\e(B-\e,TO\e(B].[\e,Thijkl\e(B]?\e,TS\e(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 ?\e,TS\e(B '(["[\e,T!\e(B-\e,TO\e(B]." 1 thai-composition-function]))
 
 (provide 'thai)