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

diff --git a/src/ChangeLog b/src/ChangeLog
index b01580f0af70cccf39a992ed77a76e0436ae2a9b..7ebe89a9bc07777539f747afabb3cab6e9061e8c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-10  Jason Rumney  <jasonr@gnu.org>
+
+       * w32fns.c (enum_font_cb2): Don't use DBCS raster fonts.
+
 2002-05-10  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * coding.c (encode_coding_sjis_big5): Enclose bitwise AND in

diff --git a/src/w32fns.c b/src/w32fns.c
index bd51244e87fe39d854b4f2f88fef886791cfd650..66a5d5796b73234fc3da8c5caa35cd5d72e08509 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6805,6 +6805,22 @@ 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;