diff options
| author | Richard M. Stallman <rms@gnu.org> | 1998-06-27 04:42:03 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1998-06-27 04:42:03 +0000 |
| commit | d25f052025b2fcf767443b78dbca00ccbc36ce6c (patch) | |
| tree | dac69556e6463fddefd097e5ce155efc511dfc09 /lisp | |
| parent | 6582d61ec5292f45f391af9a2c55054ef2bfab7f (diff) | |
| download | emacs-d25f052025b2fcf767443b78dbca00ccbc36ce6c.tar.gz emacs-d25f052025b2fcf767443b78dbca00ccbc36ce6c.tar.bz2 emacs-d25f052025b2fcf767443b78dbca00ccbc36ce6c.zip | |
(set-face-font): For now, don't call
resolve-fontset-name on Windows.
(set-face-font-auto): Likewise.
Diffstat (limited to 'lisp')
| -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 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)) |