[Emacs-diffs] emacs-25 1c58fa1: Fix variable-pitch font on MS-Windows

[Eli Zaretskii]

branch: emacs-25
commit 1c58fa1d09686b1c1ea676c7be46055722608e6c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 lisp/faces.el |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/faces.el b/lisp/faces.el
index 612bd16..5f3020b 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)