(enum_font_cb2): Don't use raster fonts for Unicode.

2 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c9b294ecf64..348dd716034 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-24  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (enum_font_cb2): Don't use raster fonts for Unicode.
+
 2008-02-24  Ulrich Neumerkel  <ulrich@complang.tuwien.ac.at>  (tiny change)
 
         * xterm.c (x_set_offset): Don't change the gravity if
diff --git a/src/w32fns.c b/src/w32fns.c
index e02eff1b95d..ba1fe88f824 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5847,6 +5847,12 @@ enum_font_cb2 (lplf, lptm, FontType, lpef)
             && 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 @@ 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;
+
         /* List bold and italic variations if w32-enable-synthesized-fonts
            is non-nil and this is a plain font.  */
         if (w32_enable_synthesized_fonts