Mercurial > emacs
diff src/w32fns.c @ 92175:049a396d6d9d
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 25 Feb 2008 00:21:57 +0000 |
| parents | f991f10f15ec 6151abddc158 |
| children | 099207aa138c |
line wrap: on
line diff
--- a/src/w32fns.c Mon Feb 25 00:01:54 2008 +0000 +++ b/src/w32fns.c Mon Feb 25 00:21:57 2008 +0000 @@ -6063,6 +6063,12 @@ && 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 @@ 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);