Mercurial > emacs

changeset 22624:a1af8a65983a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set-face-font): For now, don't call resolve-fontset-name on Windows. (set-face-font-auto): Likewise.
author Richard M. Stallman <rms@gnu.org>
date Sat, 27 Jun 1998 04:42:03 +0000
parents ccc1f8081ef1
children e7bd87148368
files lisp/faces.el
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/faces.el	Fri Jun 26 20:10:57 1998 +0000
+++ b/lisp/faces.el	Sat Jun 27 04:42:03 1998 +0000
@@ -149,7 +149,8 @@
 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 @@
 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))