From 70ccc86659c536faae2f554f3d551cbc132b71b7 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 12 Jun 1998 07:10:59 +0000 Subject: [PATCH] (set-face-font): Pay attention to fontset. (set-face-font-auto): Call resolve-fontset-name. --- lisp/faces.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index ad394fb8e01..c9da85b19c8 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -149,7 +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 (query-fontset 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, @@ -164,9 +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 (fontset-name-p font) - (or (query-fontset font) - (instantiate-fontset 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.5