diff options
| author | Richard M. Stallman | 1998-06-27 04:42:03 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-06-27 04:42:03 +0000 |
| commit | d25f052025b2fcf767443b78dbca00ccbc36ce6c (patch) | |
| tree | dac69556e6463fddefd097e5ce155efc511dfc09 | |
| parent | 6582d61ec5292f45f391af9a2c55054ef2bfab7f (diff) | |
| download | emacs-d25f052025b2fcf767443b78dbca00ccbc36ce6c.tar.gz emacs-d25f052025b2fcf767443b78dbca00ccbc36ce6c.zip | |
(set-face-font): For now, don't call
resolve-fontset-name on Windows.
(set-face-font-auto): Likewise.
| -rw-r--r-- | lisp/faces.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index c9da85b19c8..b1b269c084f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -149,7 +149,8 @@ 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 (resolve-fontset-name font) | 152 | (setq font (or (and (not (eq window-system 'w32)) |
| 153 | (resolve-fontset-name font)) | ||
| 153 | (x-resolve-font-name font 'default frame)))) | 154 | (x-resolve-font-name font 'default frame)))) |
| 154 | (internal-set-face-1 face 'font font 3 frame) | 155 | (internal-set-face-1 face 'font font 3 frame) |
| 155 | ;; Record that this face's font was set explicitly, not automatically, | 156 | ;; Record that this face's font was set explicitly, not automatically, |
| @@ -164,7 +165,8 @@ If the optional FRAME argument is provided, change only | |||
| 164 | in that frame; otherwise change each frame." | 165 | in that frame; otherwise change each frame." |
| 165 | (interactive (internal-face-interactive "font")) | 166 | (interactive (internal-face-interactive "font")) |
| 166 | (if (stringp font) | 167 | (if (stringp font) |
| 167 | (setq font (or (resolve-fontset-name font) | 168 | (setq font (or (and (not (eq window-system 'w32)) |
| 169 | (resolve-fontset-name font)) | ||
| 168 | (x-resolve-font-name font 'default frame)))) | 170 | (x-resolve-font-name font 'default frame)))) |
| 169 | (internal-set-face-1 face 'font font 3 frame)) | 171 | (internal-set-face-1 face 'font font 3 frame)) |
| 170 | 172 | ||