From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 Apr 2016 09:56:03 +0000 (+0300)
Subject: Fix variable-pitch font on MS-Windows
X-Git-Tag: emacs-25.0.94~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c58fa1d09686b1c1ea676c7be46055722608e6c;p=emacs.git

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 612bd1677bb..5f3020b3189 100644
--- 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)