From: Jason Rumney Date: Tue, 20 May 2008 23:37:27 +0000 (+0000) Subject: (add_font_entity_to_list): Don't add non-opentype X-Git-Tag: emacs-pretest-23.0.90~5402 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c2a72d900a7b0615149c1f775144aea41f9e159;p=emacs.git (add_font_entity_to_list): Don't add non-opentype truetype fonts to opentype list. --- diff --git a/src/ChangeLog b/src/ChangeLog index 7348347a380..7b9f9931d89 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-05-20 Jason Rumney + + * w32font.c (add_font_entity_to_list): Don't add non-opentype + truetype fonts to opentype list. + 2008-05-20 Juanma Barranquero * fontset.c (Ffontset_info): Doc fix. diff --git a/src/w32font.c b/src/w32font.c index ea00f8b0a97..4ce9e4c8459 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1311,8 +1311,7 @@ add_font_entity_to_list (logical_font, physical_font, font_type, lParam) Lisp_Object backend = match_data->opentype_only ? Quniscribe : Qgdi; if ((!match_data->opentype_only - || (physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE) - || (font_type & TRUETYPE_FONTTYPE)) + || (physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE)) && logfonts_match (&logical_font->elfLogFont, &match_data->pattern) && font_matches_spec (font_type, physical_font, match_data->orig_font_spec, backend,