# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 895715252 0
# Node ID 58a65bc4156ac257035f493c3fbcdbf02f7c73e3
# Parent  7b2a57ff032aea81978faadc5c098f1862a8fba1
Generate style variants fontset for
standard-fontset-spec.  Generate a fontset based on resolved font
name of a font specified by X resource or -fn command line arg.

diff -r 7b2a57ff032a -r 58a65bc4156a lisp/term/x-win.el
--- a/lisp/term/x-win.el	Thu May 21 01:47:11 1998 +0000
+++ b/lisp/term/x-win.el	Thu May 21 01:47:32 1998 +0000
@@ -658,7 +658,7 @@
 (if (fboundp 'new-fontset)
     (progn
       ;; Create the standard fontset.
-      (create-fontset-from-fontset-spec standard-fontset-spec)
+      (create-fontset-from-fontset-spec standard-fontset-spec t)
 
       ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
       (create-fontset-from-x-resource)
@@ -674,10 +674,11 @@
       (let ((font (or (cdr (assq 'font initial-frame-alist))
 		      (cdr (assq 'font default-frame-alist))
 		      (x-get-resource "font" "Font")))
-	    xlfd-fields)
+	    resolved-name xlfd-fields)
 	(if (and font
 		 (not (query-fontset font))
-		 (setq xlfd-fields (x-decompose-font-name font)))
+		 (setq resolved-name (or (x-resolve-font-name font) font))
+		 (setq xlfd-fields (x-decompose-font-name resolved-name)))
 	    (if (string= "fontset"
 			 (aref xlfd-fields xlfd-regexp-registry-subnum))
 		(new-fontset font (x-complement-fontset-spec xlfd-fields nil))
@@ -691,7 +692,7 @@
 		(aset xlfd-fields xlfd-regexp-registry-subnum "fontset")
 		(aset xlfd-fields xlfd-regexp-encoding-subnum "startup")
 		(setq fontset (x-compose-font-name xlfd-fields))
-		(setq fontset-spec (concat fontset ", ascii:" font))
+		(setq fontset-spec (concat fontset ", ascii:" resolved-name))
 		(create-fontset-from-fontset-spec fontset-spec t)
 		(setq fontset-alias-alist
 		      (cons (cons fontset font) fontset-alias-alist)))