aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa1997-07-31 05:54:08 +0000
committerKenichi Handa1997-07-31 05:54:08 +0000
commitb9f33f360256714a9021e9dbcd8104d9fc1999ec (patch)
tree23f48c882a4e924a7a634de5873d40a5f6391441
parent35d4066a61b26a9686610e447cc7a23e25962c13 (diff)
downloademacs-b9f33f360256714a9021e9dbcd8104d9fc1999ec.tar.gz
emacs-b9f33f360256714a9021e9dbcd8104d9fc1999ec.zip
(set-face-font-auto): Create a fontset if FONT is a
fontset not instanciated fontset.
-rw-r--r--lisp/faces.el4
1 files changed, 3 insertions, 1 deletions
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
173in that frame; otherwise change each frame." 173in that frame; otherwise change each frame."
174 (interactive (internal-face-interactive "font")) 174 (interactive (internal-face-interactive "font"))
175 (if (stringp font) 175 (if (stringp font)
176 (setq font (or (query-fontset font) 176 (setq font (or (and (fontset-name-p font)
177 (or (query-fontset font)
178 (instanciate-fontset font)))
177 (x-resolve-font-name font 'default frame)))) 179 (x-resolve-font-name font 'default frame))))
178 (internal-set-face-1 face 'font font 3 frame)) 180 (internal-set-face-1 face 'font font 3 frame))
179 181