Merge from origin/emacs-25

[gnu-emacs] / lisp / language / khmer.el

diff --git a/lisp/language/khmer.el b/lisp/language/khmer.el
index 77c9e00ff6ce65bbcf85bf3ed0bed37ba439ba61..8663ff22ca0e9b94b1c0beb97495eab4b837d4cd 100644 (file)
--- a/lisp/language/khmer.el
+++ b/lisp/language/khmer.el
@@ -1,6 +1,6 @@
-;;; khmer.el --- support for Khmer -*- coding: utf-8; no-byte-compile: t -*-
+;;; khmer.el --- support for Khmer -*- coding: utf-8 -*-
 
-;; Copyright (C) 2008
+;; Copyright (C) 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
@@ -30,9 +30,9 @@
           (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))
 
-;; arch-tag: 032890e4-a936-4584-ad44-79eb5f8bc98e
 ;; khmer.el ends here