From: Kenichi Handa <handa@m17n.org>
Date: Mon, 27 Nov 2006 04:36:00 +0000 (+0000)
Subject: (face-font-registry-alternatives): Add gb18030.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~669
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e38c812e547847e5926b1818c76fd78c5d53307c;p=emacs.git

(face-font-registry-alternatives): Add gb18030.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index a7b93568f13..8beb5d69f5c 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -81,11 +81,11 @@ ALTERNATIVE2 etc."
 (defcustom face-font-registry-alternatives
   (if (eq system-type 'windows-nt)
       '(("iso8859-1" "ms-oemlatin")
-	("gb2312.1980" "gb2312")
+	("gb2312.1980" "gb2312" "gbk" "gb18030")
 	("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
 	("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
 	("muletibetan-2" "muletibetan-0"))
-    '(("gb2312.1980" "gb2312.80&gb8565.88" "gbk*")
+    '(("gb2312.1980" "gb2312.80&gb8565.88" "gbk" "gb18030")
       ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
       ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
       ("muletibetan-2" "muletibetan-0")))