# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1203890567 0
# Node ID 6151abddc158f0854c71953e170a278ab12d0bd2
# Parent  00f28ef41efd1fe63ff3a0b423267797525c8d51
(enum_font_cb2): Don't use raster fonts for Unicode.

diff -r 00f28ef41efd -r 6151abddc158 src/w32fns.c
--- a/src/w32fns.c	Sun Feb 24 16:57:51 2008 +0000
+++ b/src/w32fns.c	Sun Feb 24 22:02:47 2008 +0000
@@ -5847,6 +5847,12 @@
 	    && lpef->logfont.lfCharSet == DEFAULT_CHARSET
 	    && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 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)
@@ -5860,6 +5866,12 @@
 	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;
+
 	/* List bold and italic variations if w32-enable-synthesized-fonts
 	   is non-nil and this is a plain font.  */
 	if (w32_enable_synthesized_fonts