# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 910755375 0
# Node ID 29fd5e07b576606e65702c0cb73eab6e78ecb640
# Parent  14c75dfaaa445c72c79a0afc0676d3525825f19f
If a resolved ASCII font name doesn't conform to
full XLFD, don't try get information of WEIGHT and SLANT from that
font name.

diff -r 14c75dfaaa44 -r 29fd5e07b576 lisp/term/x-win.el
--- a/lisp/term/x-win.el	Wed Nov 11 03:36:15 1998 +0000
+++ b/lisp/term/x-win.el	Wed Nov 11 03:36:15 1998 +0000
@@ -708,18 +708,17 @@
 		(let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum))
 		      (slant (aref xlfd-fields xlfd-regexp-slant-subnum))
 		      xlfd-temp)
-		  (if (or (not weight) (string-match "[*?]*" weight))
-		      (progn
-			(setq xlfd-temp (x-decompose-font-name resolved-name))
-			(aset xlfd-fields xlfd-regexp-weight-subnum
-			      (aref xlfd-temp xlfd-regexp-weight-subnum))))
-		  (if (or (not slant) (string-match "[*?]*" slant))
-		      (progn
-			(or xlfd-temp
-			    (setq xlfd-temp
-				  (x-decompose-font-name resolved-name)))
-			(aset xlfd-fields xlfd-regexp-slant-subnum
-			      (aref xlfd-temp xlfd-regexp-slant-subnum)))))
+		  (if (and (or (not weight) (string-match "[*?]*" weight))
+			   (setq xlfd-temp
+				 (x-decompose-font-name resolved-name)))
+		      (aset xlfd-fields xlfd-regexp-weight-subnum
+			    (aref xlfd-temp xlfd-regexp-weight-subnum)))
+		  (if (and (or (not slant) (string-match "[*?]*" slant))
+			   (or xlfd-temp
+			       (setq xlfd-temp
+				     (x-decompose-font-name resolved-name))))
+		      (aset xlfd-fields xlfd-regexp-slant-subnum
+			    (aref xlfd-temp xlfd-regexp-slant-subnum))))
 		(setq fontset (x-compose-font-name xlfd-fields))
 		(create-fontset-from-fontset-spec
 		 (concat fontset ", ascii:" font) styles)