Merge from emacs--rel--22

[gnu-emacs] / src / w32fns.c

diff --git a/src/w32fns.c b/src/w32fns.c
index 838367fe399aed79b24b28e893ff066c4a07b74d..ae6cc88ea6bb667dad376811a8134d8dbeff618e 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6063,6 +6063,12 @@ enum_font_cb2 (lplf, lptm, FontType, lpef)
            && lpef->logfont.lfCharSet == DEFAULT_CHARSET
            && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET, NULL)) != 0)
          return 1;
+
+        /* Reject raster fonts if we are looking for a unicode font.  */
+        if (charset
+            && FontType == RASTER_FONTTYPE
+            && strncmp (charset, "iso10646", 8) == 0)
+          return 1;
       }
 
     if (charset)
@@ -6079,6 +6085,12 @@ enum_font_cb2 (lplf, lptm, FontType, lpef)
        Lisp_Object this_charset = Fcar (charset_list);
        charset = SDATA (this_charset);
 
+       /* Don't list  raster fonts as unicode.  */
+       if (charset
+           && FontType == RASTER_FONTTYPE
+           && strncmp (charset, "iso10646", 8) == 0)
+         continue;
+
        enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
                                     charset, width);