martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(set-face-font): For now, don't call

Browse Source 
resolve-fontset-name on Windows.
(set-face-font-auto): Likewise.
This commit is contained in:
Richard M. Stallman
1998-06-27 04:42:03 +00:00
parent 6582d61ec5
commit d25f052025
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/faces.el
View File

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