From: Andrew Innes <andrewi@gnu.org>
Date: Thu, 4 Oct 2001 17:14:53 +0000 (+0000)
Subject: (face-font-registry-alternatives) [windows-nt]: Make
X-Git-Tag: emacs-21.1~84
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c97db4e4de8246cdac2bcd013b230b058c8790ec;p=emacs.git

(face-font-registry-alternatives) [windows-nt]: Make
gb2312 an alias for gb2312.1980.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 9b52c03ab7e..822a7bbf686 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -79,10 +79,15 @@ ALTERNATIVE2 etc."
 
 ;; This is defined originally in xfaces.c.
 (defcustom face-font-registry-alternatives
-  '(("gb2312.1980" "gb2312.80&gb8565.88" "gbk*")
-    ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
-    ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
-    ("muletibetan-2" "muletibetan-0"))
+  (if (eq system-type 'windows-nt)
+      '(("gb2312.1980" "gb2312")
+	("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
+	("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
+	("muletibetan-2" "muletibetan-0"))
+    '(("gb2312.1980" "gb2312.80&gb8565.88" "gbk*")
+      ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
+      ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
+      ("muletibetan-2" "muletibetan-0")))
   "*Alist of alternative font registry names.
 Each element has the the form (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...).
 If fonts of registry REGISTRY can be loaded, font selection