mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jason Rumney 2002-05-10 19:18:53 +00:00
parent c1cdea1a79
commit 6358474d16
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
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

15
src/w32fns.c
View file

@ -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;