Commit 6358474d authored by Jason Rumney's avatar Jason Rumney

(enum_font_cb2): Don't use DBCS raster fonts.

parent c1cdea1a
2002-05-10 Jason Rumney <jasonr@gnu.org>
* w32fns.c (enum_font_cb2): Avoid DBCS raster fonts.
2002-05-10 Eli Zaretskii <eliz@is.elta.co.il>
* coding.c (encode_coding_sjis_big5): Enclose bitwise AND in
......
......@@ -7127,6 +7127,21 @@ enum_font_cb2 (lplf, lptm, FontType, lpef)
lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet)
return 1;
if (FontType == RASTER_FONTTYPE)
{
/* DBCS raster fonts have problems displaying, so skip them. */
int charset = lplf->elfLogFont.lfCharSet;
if (charset == SHIFTJIS_CHARSET
|| charset == HANGEUL_CHARSET
|| charset == CHINESEBIG5_CHARSET
|| charset == GB2312_CHARSET
#ifdef JOHAB_CHARSET
|| charset == JOHAB_CHARSET
#endif
)
return 1;
}
{
char buf[100];
Lisp_Object width = Qnil;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment