diff options
| author | Andrew Innes | 1998-11-03 22:26:56 +0000 |
|---|---|---|
| committer | Andrew Innes | 1998-11-03 22:26:56 +0000 |
| commit | 8cd2ac8d1a48b76dff855f969234a9071854bf5a (patch) | |
| tree | cfc6a03dbe77563d269b3ee6a57799fe1e8929d8 | |
| parent | 1a292d24f1481eab918d6a46e22d1f75ed9322ee (diff) | |
| download | emacs-8cd2ac8d1a48b76dff855f969234a9071854bf5a.tar.gz emacs-8cd2ac8d1a48b76dff855f969234a9071854bf5a.zip | |
(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 e3e521bd713..24abd40a06c 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -149,8 +149,7 @@ If the optional FRAME argument is provided, change only | |||
| 149 | in that frame; otherwise change each frame." | 149 | in that frame; otherwise change each frame." |
| 150 | (interactive (internal-face-interactive "font")) | 150 | (interactive (internal-face-interactive "font")) |
| 151 | (if (stringp font) | 151 | (if (stringp font) |
| 152 | (setq font (or (and (not (eq window-system 'w32)) | 152 | (setq font (or (resolve-fontset-name font) |
| 153 | (resolve-fontset-name font)) | ||
| 154 | (x-resolve-font-name font 'default frame)))) | 153 | (x-resolve-font-name font 'default frame)))) |
| 155 | (internal-set-face-1 face 'font font 3 frame) | 154 | (internal-set-face-1 face 'font font 3 frame) |
| 156 | ;; Record that this face's font was set explicitly, not automatically, | 155 | ;; Record that this face's font was set explicitly, not automatically, |
| @@ -165,8 +164,7 @@ If the optional FRAME argument is provided, change only | |||
| 165 | in that frame; otherwise change each frame." | 164 | in that frame; otherwise change each frame." |
| 166 | (interactive (internal-face-interactive "font")) | 165 | (interactive (internal-face-interactive "font")) |
| 167 | (if (stringp font) | 166 | (if (stringp font) |
| 168 | (setq font (or (and (not (eq window-system 'w32)) | 167 | (setq font (or (resolve-fontset-name font) |
| 169 | (resolve-fontset-name font)) | ||
| 170 | (x-resolve-font-name font 'default frame)))) | 168 | (x-resolve-font-name font 'default frame)))) |
| 171 | (internal-set-face-1 face 'font font 3 frame)) | 169 | (internal-set-face-1 face 'font font 3 frame)) |
| 172 | 170 | ||