mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 12:20:39 -08:00
Code Issues Projects Releases Wiki Activity

(enum_font_cb2): Don't let charsets unknown to Windows

Browse source 
match each other.
This commit is contained in:
Jason Rumney 2002-02-09 01:08:33 +00:00
parent fd4f8b36c6
commit 644cefdf62
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/w32fns.c
View file

@ -7038,11 +7038,13 @@ enum_font_cb2 (lplf, lptm, FontType, lpef)
{
charset = xlfd_charset_of_font (XSTRING(*(lpef->pattern))->data);
/* Ensure that charset is valid for this font.
Continue if invalid in case charset contains a wildcard. */
if (charset
&& (x_to_w32_charset (charset) != lplf->elfLogFont.lfCharSet))
charset = NULL;
/* We already checked charsets above, but DEFAULT_CHARSET
slipped through. So only allow exact matches for DEFAULT_CHARSET. */
if (charset
&& strncmp (charset, "*-*", 3) != 0
&& lpef->logfont.lfCharSet == DEFAULT_CHARSET
&& strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0)
return 1;
}
if (charset)