Mercurial > emacs

changeset 23621:82325b2dbb5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set-face-font): Call resolve-fontset-name on w32. (set-face-font-auto): Ditto.
author Andrew Innes <andrewi@gnu.org>
date Tue, 03 Nov 1998 22:26:56 +0000
parents 2b55b8f8cdc1
children 0dc79ede9c53
files lisp/faces.el
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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))