Fix variable-pitch font on MS-Windows

* lisp/faces.el (variable-pitch) [w32]: Name a variable-pitch font
explicitly, to avoid Emacs picking up a bold-italic variant on
some MS-Windows systems.  See this thread for details:
http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html.

diff --git a/lisp/faces.el b/lisp/faces.el
index 612bd1677bbf86d12a11a5f01980a03f7c769ed6..5f3020b3189b37452cce66d853eb0281c279d6ef 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2281,7 +2281,11 @@ If you set `term-file-prefix' to nil, this function does nothing."
   :group 'basic-faces)
 
 (defface variable-pitch
-  '((t :family "Sans Serif"))
+  '((((type w32))
+     ;; This is a kludgey 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"))
   "The basic variable-pitch face."
   :group 'basic-faces)