Mercurial > emacs

diff lisp/faces.el @ 22447:2806e56a2aae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set-face-font): Pay attention to fontset. (set-face-font-auto): Call resolve-fontset-name.
author Kenichi Handa <handa@m17n.org>
date Fri, 12 Jun 1998 07:10:59 +0000
parents d06567759809
children a1af8a65983a
line wrap: on
line diff
--- a/lisp/faces.el	Fri Jun 12 05:59:33 1998 +0000
+++ b/lisp/faces.el	Fri Jun 12 07:10:59 1998 +0000
@@ -149,7 +149,7 @@
 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 @@
 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))