# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 910132016 0
# Node ID 82325b2dbb5ef956b1040594ebb852f87af42f2b
# Parent  2b55b8f8cdc13d3b640366e30010c47826c67d29
(set-face-font): Call resolve-fontset-name on w32.

(set-face-font-auto): Ditto.

diff -r 2b55b8f8cdc1 -r 82325b2dbb5e lisp/faces.el
--- a/lisp/faces.el	Tue Nov 03 22:21:58 1998 +0000
+++ b/lisp/faces.el	Tue Nov 03 22:26:56 1998 +0000
@@ -149,8 +149,7 @@
 in that frame; otherwise change each frame."
   (interactive (internal-face-interactive "font"))
   (if (stringp font)
-      (setq font (or (and (not (eq window-system 'w32))
-			  (resolve-fontset-name font))
+      (setq font (or (resolve-fontset-name font)
 		     (x-resolve-font-name font 'default frame))))
   (internal-set-face-1 face 'font font 3 frame)
   ;; Record that this face's font was set explicitly, not automatically,
@@ -165,8 +164,7 @@
 in that frame; otherwise change each frame."
   (interactive (internal-face-interactive "font"))
   (if (stringp font)
-      (setq font (or (and (not (eq window-system 'w32))
-			  (resolve-fontset-name font))
+      (setq font (or (resolve-fontset-name font)
 		     (x-resolve-font-name font 'default frame))))
   (internal-set-face-1 face 'font font 3 frame))