Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(set-face-font): Pay attention to fontset.

Browse source 
(set-face-font-auto): Call resolve-fontset-name.
This commit is contained in:
Kenichi Handa 1998-06-12 07:10:59 +00:00
parent 88be0819a1
commit 70ccc86659
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/faces.el
View file

@ -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))