2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62639bc8e59..665443add0c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-19  Kenichi Handa  <handa@m17n.org>
 
+        * international/fontset.el (setup-default-fontset): Add a spec of
+        non-OTF unicode font for Thai.
+
         * fringe.el: Add coding: utf-8 cookie.
 
 2009-06-18  Kenichi Handa  <handa@m17n.org>
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 103cfccc611..423dfa5d364 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -326,7 +326,8 @@
             (nil . "VISCII1.1-1")
             ,(font-spec :registry "iso10646-1" :script 'latin))
 
-     (thai  ,(font-spec :registry "iso10646-1" :otf '(thai nil nil (mark)))
+     (thai  ,(font-spec :registry "iso10646-1" :otf '(thai nil nil (mark))
+            ,(font-spec :registry "iso10646-1" :script 'thai))
             (nil . "TIS620*")
             (nil . "ISO8859-11"))