Improve definition of 'variable-pitch' face on MS-Windows

* lisp/faces.el (variable-pitch): Don't specify too many
attributes of the font, otherwise faces that request different
weight or slant or size will not get them.

diff --git a/lisp/faces.el b/lisp/faces.el
index 2d1c4ce4723520d3d64969586270cd0041658f00..d7795434694dd0b7f72330c48c1dd18acf81ec57 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2311,10 +2311,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)