From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 27 Jun 1998 04:42:03 +0000 (+0000)
Subject: (set-face-font): For now, don't call
X-Git-Tag: emacs-20.3~455
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d25f052025b2fcf767443b78dbca00ccbc36ce6c;p=emacs.git

(set-face-font): For now, don't call
resolve-fontset-name on Windows.
(set-face-font-auto): Likewise.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index c9da85b19c8..b1b269c084f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -149,7 +149,8 @@ If the optional FRAME argument is provided, change only
 in that frame; otherwise change each frame."
   (interactive (internal-face-interactive "font"))
   (if (stringp font)
-      (setq font (or (resolve-fontset-name font)
+      (setq font (or (and (not (eq window-system 'w32))
+			  (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,
@@ -164,7 +165,8 @@ If the optional FRAME argument is provided, change only
 in that frame; otherwise change each frame."
   (interactive (internal-face-interactive "font"))
   (if (stringp font)
-      (setq font (or (resolve-fontset-name font)
+      (setq font (or (and (not (eq window-system 'w32))
+			  (resolve-fontset-name font))
 		     (x-resolve-font-name font 'default frame))))
   (internal-set-face-1 face 'font font 3 frame))