# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 858726987 0
# Node ID 84aa6682810b7c35cba3abd554794d283c8e1c6b
# Parent  1798b476d58b318c1980118936431e7bc9d9a743
(set-face-font): Allow specifing fontset for the arg FONT.

diff -r 1798b476d58b -r 84aa6682810b lisp/faces.el
--- a/lisp/faces.el	Tue Mar 18 23:14:07 1997 +0000
+++ b/lisp/faces.el	Tue Mar 18 23:16:27 1997 +0000
@@ -116,7 +116,9 @@
 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 (x-resolve-font-name font 'default frame)))
+  (if (stringp font)
+      (setq font (or (query-fontset font)
+		     (x-resolve-font-name font 'default frame))))
   (internal-set-face-1 face 'font font 3 frame))
 
 (defun set-face-foreground (face color &optional frame)