diff options
| author | Kenichi Handa <handa@m17n.org> | 1998-06-12 07:10:59 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 1998-06-12 07:10:59 +0000 |
| commit | 7b7714f9fcb166a0ded84f2b3b7fd39542be6fa4 (patch) | |
| tree | e9fd3856163937498a0aa9359e2e31da79319acb | |
| parent | 8541213fac80ac8fd8ce86afdc30fb3f21e8746c (diff) | |
| download | emacs-7b7714f9fcb166a0ded84f2b3b7fd39542be6fa4.tar.gz | |
(set-face-font): Pay attention to fontset.
(set-face-font-auto): Call resolve-fontset-name.
| -rw-r--r-- | lisp/faces.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index ad394fb8e01..c9da85b19c8 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -149,7 +149,7 @@ 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 (resolve-fontset-name font) (x-resolve-font-name font 'default frame)))) (internal-set-face-1 face 'font font 3 frame) ;; Record that this face's font was set explicitly, not automatically, @@ -164,9 +164,7 @@ 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 (and (fontset-name-p font) - (or (query-fontset font) - (instantiate-fontset font))) + (setq font (or (resolve-fontset-name font) (x-resolve-font-name font 'default frame)))) (internal-set-face-1 face 'font font 3 frame)) |