aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32fns.c
diff options
context:
space:
mode:
authorJason Rumney <[email protected]>2008-02-24 22:04:07 +0000
committerJason Rumney <[email protected]>2008-02-24 22:04:07 +0000
commit59c6b61cdaafdcc94db8561425aba146ac01e9dc (patch)
tree89b492e96da89432cdca03d19958e35d3f760e08 /src/w32fns.c
parent12f68d3fdf486789ceb06466de4c4d158da244e9 (diff)
(enum_font_cb2): Don't use raster fonts for Unicode.
Diffstat (limited to 'src/w32fns.c')
-rw-r--r--src/w32fns.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index e02eff1b95..ba1fe88f82 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