From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 24 Mar 2016 16:30:41 +0000 (+0200)
Subject: Improve font selection by family on MS-Windows
X-Git-Tag: emacs-25.0.93~89^2~28
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/7eba90c12227d86636aaa3da8d68b0c213fb3910

Improve font selection by family on MS-Windows

* src/w32font.c (w32font_list_internal): Allow 'ascii-0' charset,
in addition to 'iso10646-1', 'unicode-bmp', and 'unicode-sip'.
This avoids rejecting many font families whose members are shown
by 'font-family-list', in particular 'courier' requested by
info.el.  Without this change, many values of ':family' attribute
of a face have no effect on MS-Windows, because they are rejected
due to bogus mismatch of the charset.
---

diff --git a/src/w32font.c b/src/w32font.c
index a1878adb4b..018e657256 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -796,7 +796,8 @@ w32font_list_internal (struct frame *f, Lisp_Object font_spec,
 	  && !EQ (spec_charset, Qiso10646_1)
 	  && !EQ (spec_charset, Qunicode_bmp)
 	  && !EQ (spec_charset, Qunicode_sip)
-	  && !EQ (spec_charset, Qunknown))
+	  && !EQ (spec_charset, Qunknown)
+	  && !EQ (spec_charset, Qascii_0))
 	return Qnil;
     }