mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

(set-face-font): Call resolve-fontset-name on w32.

Browse source 
(set-face-font-auto): Ditto.
This commit is contained in:
Andrew Innes 1998-11-03 22:26:56 +00:00
parent 1a292d24f1
commit 8cd2ac8d1a
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/faces.el
View file

@ -149,8 +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 (and (not (eq window-system 'w32))
(resolve-fontset-name 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,
@ -165,8 +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 (not (eq window-system 'w32))
(resolve-fontset-name font))
(setq font (or (resolve-fontset-name font)
(x-resolve-font-name font 'default frame))))
(internal-set-face-1 face 'font font 3 frame))