aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/faces.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 0641a1695e..f925daa6e7 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))