Fix setting of composition-function-table.

diff --git a/lisp/language/cham.el b/lisp/language/cham.el
index 80e92243c42eb3d9fea22debf8313003c762d067..5dbc0b6383349782a72e2e8042636fc96acd6f25 100644 (file)
--- a/lisp/language/cham.el
+++ b/lisp/language/cham.el
@@ -29,7 +29,7 @@
 
 (set-char-table-range composition-function-table
                      '(#xAA00 . #xAA5F)
-                     '(("[\xAA00-\xAA5F]+" . font-shape-text)))
+                     (list (vector "[\xAA00-\xAA5F]+" 0 'font-shape-gstring)))
 
 (set-language-info-alist
  "Cham" '((charset unicode)

diff --git a/lisp/language/khmer.el b/lisp/language/khmer.el
index 77c9e00ff6ce65bbcf85bf3ed0bed37ba439ba61..0427eaafee4740f0970f46b702aaa67a92ba2118 100644 (file)
--- a/lisp/language/khmer.el
+++ b/lisp/language/khmer.el
@@ -30,7 +30,8 @@
           (sample-text . "Khmer (ភាសាខ្មែរ)  ជំរាបសួរ")
           (documentation . t)))
 
-(let ((val '(("[\x1780-\x17FF\x19E0-\x19FF\x200C\x200D]+" . font-shape-text))))
+(let ((val (list (vector "[\x1780-\x17FF\x19E0-\x19FF\x200C\x200D]+"
+                        0 'font-shape-gstring))))
   (set-char-table-range composition-function-table '(#x1780 . #x17FF) val)
   (set-char-table-range composition-function-table '(#x19E0 . #x19FF) val))