diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:24:51 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:24:51 -0700 |
| commit | 468259c26e79113b6208324305ffc22ad74a041e (patch) | |
| tree | 926ec10d0fd0da8ece39fe8899751839d983aceb /lisp/faces.el | |
| parent | bb9924128397d072c6997de1f0b77ee8ae671e0e (diff) | |
| parent | 0e35405a92be502ab3851890fc4eb660842fd3a9 (diff) | |
| download | emacs-468259c26e79113b6208324305ffc22ad74a041e.tar.gz | |
Merge from origin/emacs-25
0e35405 Improve documentation of coding-systems
c2fd04c Improve definition of 'variable-pitch' face on MS-Windows
16fb50d Fix an error message in python.el
a2a2073 Clarify major mode switching
fc38671 Add helpful comment to compile-command's docstring
ee65d85 Fix ':version' of 'select-enable-primary'
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index d4f2f08acf5..e62561a63a5 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2349,10 +2349,13 @@ If you set `term-file-prefix' to nil, this function does nothing." (defface variable-pitch '((((type w32)) - ;; This is a kludgy workaround for an issue discussed in + ;; This is a workaround for an issue discussed in ;; http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html. - :font "-outline-Arial-normal-normal-normal-sans-*-*-*-*-p-*-iso8859-1") - (t :family "Sans Serif")) + ;; We need (a) the splash screen not to pick up bold-italics variant of + ;; the font, and (b) still be able to request bold/italic/larger size + ;; variants in the likes of EWW. + :family "Arial" :foundry "outline") + (t :family "Sans Serif")) "The basic variable-pitch face." :group 'basic-faces) |