# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 897635459 0
# Node ID 2806e56a2aae5217d338035e7308a3c045dac96f
# Parent  5988c3c973db656616cba136a5485bef0e16e61d
(set-face-font): Pay attention to fontset.
(set-face-font-auto): Call resolve-fontset-name.

diff -r 5988c3c973db -r 2806e56a2aae lisp/faces.el
--- 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))