Register thai-composition-function in

composition-function-table.
(thai-tis620): Delete `pre-write-conversion' property.

diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 6d9140c059538769abb4941c00ea4b14ea187f94..addb4381e6df4f90c4d2f58bd74634e1163f03bf 100644 (file)
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -34,8 +34,7 @@
  '(ascii thai-tis620 nil nil
    nil ascii-eol)
  '((safe-charsets ascii thai-tis620)
-   (post-read-conversion . thai-post-read-conversion)
-   (pre-write-conversion . thai-pre-write-conversion)))
+   (post-read-conversion . thai-post-read-conversion)))
 
 (define-coding-system-alias 'th-tis620 'thai-tis620)
 (define-coding-system-alias 'tis620 'thai-tis620)
@@ -50,7 +49,12 @@
          (input-method . "thai-kesmanee")
          (unibyte-display . thai-tis620)
          (features thai-util)
-         (sample-text . "Thai (\e,T@RIRd7B\e(B)          \e,TJ\e(B\e0\e,TGQ\e(B\e1\e,TJ\e(B\e0\e,T4U\e(B\e1\e,T$\e(B\e0\e,TCQ\e(B\e1\e,T:\e(B, \e,TJ\e(B\e0\e,TGQ\e(B\e1\e,TJ\e(B\e0\e,T4U\e(B\e1\e0\e,T$h\e(B\e1\e,TP\e(B")
+         (sample-text . "Thai (\e,T@RIRd7B\e(B)          \e,TJ\e0GQ\e1J\e04U\e1$\e0CQ\e1:\e(B, \e,TJ\e0GQ\e1J\e04U\e1\e0$h\e1P\e(B")
          (documentation . t)))
 
+
+;; Register a function to compose Thai characters.
+(aset composition-function-table (make-char 'thai-tis620)
+      '(("\\c0\\c4\\|\\c0\\(\\c2\\|\\c3\\)\\c4?" . thai-composition-function)))
+
 ;;; thai.el ends here