Merge changes from emacs-23 branch.

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

diff --git a/lisp/language/cham.el b/lisp/language/cham.el
index 80e92243c42eb3d9fea22debf8313003c762d067..ac543bd073c8edbdf2f6a194ec994b5e5b67e98a 100644 (file)
--- a/lisp/language/cham.el
+++ b/lisp/language/cham.el
@@ -1,6 +1,6 @@
 ;;; cham.el --- support for Cham -*- coding: utf-8; no-byte-compile: t -*-
 
-;; Copyright (C) 2008
+;; Copyright (C) 2008, 2009, 2010
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
@@ -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)