(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 c9da85b19c87ec21aa27ebc873e2fcf139fe46dd..b1b269c084fb17100d8c99dd970320ed0993aef3 100644 (file)
--- 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))