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

This commit is contained in:
Jason Rumney 2008-02-24 22:04:07 +00:00
parent 12f68d3fdf
commit 59c6b61cda
2 changed files with 16 additions and 0 deletions

View file

@ -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

View file

@ -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