From: Kenichi Handa <handa@m17n.org>
Date: Thu, 31 Jul 1997 05:54:08 +0000 (+0000)
Subject: (set-face-font-auto): Create a fontset if FONT is a
X-Git-Tag: emacs-20.1~896
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9f33f360256714a9021e9dbcd8104d9fc1999ec;p=emacs.git

(set-face-font-auto): Create a fontset if FONT is a
fontset not instanciated fontset.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 0641a1695e0..f925daa6e70 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -173,7 +173,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 (or (query-fontset font)
+      (setq font (or (and (fontset-name-p font)
+			  (or (query-fontset font)
+			      (instanciate-fontset font)))
 		     (x-resolve-font-name font 'default frame))))
   (internal-set-face-1 face 'font font 3 frame))