From: Jason Rumney <jasonr@gnu.org>
Date: Fri, 20 Jun 2008 08:00:56 +0000 (+0000)
Subject: (setup-default-fontset): Specify script for latin use of iso10646-1.
X-Git-Tag: emacs-pretest-23.0.90~4661
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=174ba8c7d1444ee3d81f98e13f4eaddcc3a1c113;p=emacs.git

(setup-default-fontset): Specify script for latin use of iso10646-1.
Fix use of lang tags.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca4aeafe5c3..d51b093aaf8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-20  Jason Rumney  <jasonr@gnu.org>
+
+        * international/fontset.el (setup-default-fontset): Specify script
+        for latin use of iso10646-1.  Fix use of lang tags.
+
 2008-06-19  Miles Bader  <miles@gnu.org>
 
 	* face-remap.el (text-scale-increase): Start from zero if
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 7020509cf1d..0baa6dbfa43 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -297,7 +297,7 @@
 	    (nil . "ISO8859-15")
 	    (nil . "ISO8859-16")
 	    (nil . "VISCII1.1-1")
-	    (nil . "ISO10646-1"))
+	    ,(font-spec :registry "iso10646-1" :script 'latin))
 
      (phonetic ,(font-spec :registry "iso10646-1" :script 'phonetic))
 
@@ -423,11 +423,11 @@
 	       (nil . "gb18030")
 	       (nil . "JISX0213.2000-1")
 	       (nil . "JISX0213.2000-2")
-	       ,(font-spec :registry "iso10646-1" :language 'ja)
-	       ,(font-spec :registry "iso10646-1" :language 'zh))
+	       ,(font-spec :registry "iso10646-1" :lang 'ja)
+	       ,(font-spec :registry "iso10646-1" :lang 'zh))
 
      (hangul (nil . "KSC5601.1987-0")
-	     ,(font-spec :registry "iso10646-1" :language 'ko))
+	     ,(font-spec :registry "iso10646-1" :lang 'ko))
 
      (braille ,(font-spec :registry "iso10646-1" :script 'braille))