diff options
| author | Andrew Innes <[email protected]> | 1998-11-03 22:26:56 +0000 |
|---|---|---|
| committer | Andrew Innes <[email protected]> | 1998-11-03 22:26:56 +0000 |
| commit | 8cd2ac8d1a48b76dff855f969234a9071854bf5a (patch) | |
| tree | cfc6a03dbe77563d269b3ee6a57799fe1e8929d8 | |
| parent | 1a292d24f1481eab918d6a46e22d1f75ed9322ee (diff) | |
(set-face-font): Call resolve-fontset-name on w32.
(set-face-font-auto): Ditto.
| -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 e3e521bd71..24abd40a06 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -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)) |