From 8cd2ac8d1a48b76dff855f969234a9071854bf5a Mon Sep 17 00:00:00 2001 From: Andrew Innes Date: Tue, 3 Nov 1998 22:26:56 +0000 Subject: [PATCH] (set-face-font): Call resolve-fontset-name on w32. (set-face-font-auto): Ditto. --- lisp/faces.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index e3e521bd713..24abd40a06c 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -149,8 +149,7 @@ 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 (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 @@ 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 (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)) -- 2.39.2