Merge from trunk

[bpt/emacs.git] / lisp / language / thai.el

diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 311e367..9bebe6e 100644 (file)
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -1,14 +1,13 @@
 ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
+;; Copyright (C) 1997-1998, 2000-2012  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 ;; Copyright (C) 2005
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Keywords: multilingual, Thai, i18n
 
@@ -76,12 +75,13 @@ 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)
 
-;; arch-tag: c7eb0e91-4db0-4619-81f8-8762e7d51e15
 ;;; thai.el ends here