mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-20 15:10:37 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs--rel--22

Browse source 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
This commit is contained in:
Miles Bader 2008-02-25 00:21:57 +00:00
commit ffe832ea68
5 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2008-02-25 Jason Rumney <jasonr@gnu.org>
* w32fns.c (enum_font_cb2): Don't use raster fonts for Unicode.
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
* s/vms4-0.h:

12
src/w32fns.c
View file

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