Fix setting of composition-function-table.

2 files changed, 3 insertions, 2 deletions

diff --git a/lisp/language/cham.el b/lisp/language/cham.el
index 80e92243c42..5dbc0b63833 100644
--- 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 77c9e00ff6c..0427eaafee4 100644
--- 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))