diff options
author | Kenichi Handa <handa@m17n.org> | 1997-03-18 23:16:27 +0000 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 1997-03-18 23:16:27 +0000 |
commit | 7bf7057d0dfb3848f27fbf66afe5a727aacebadc (patch) | |
tree | b6e9211f449ea02dd64bf8de1bfb116ad0039ca6 /lisp | |
parent | 76fe953a16764b673026f48387ba57c881d84d6e (diff) | |
download | emacs-7bf7057d0dfb3848f27fbf66afe5a727aacebadc.tar.gz |
(set-face-font): Allow specifing fontset for the arg FONT.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 26b2691e288..438f80adb07 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -116,7 +116,9 @@ If FRAME is omitted or nil, use the selected frame." 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) |