diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-25 00:21:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-25 00:21:57 +0000 |
| commit | ffe832ea680b4820f5ff399191f7f2d41350ee2e (patch) | |
| tree | dd42d69046f8209a8e2c89f54409ac7a0ce9bf7d /src | |
| parent | d8891294b81672883c21b6b957e5a17b6990b8e4 (diff) | |
| parent | ff20fdbbd2bbfa87a058c182768e3731025013ca (diff) | |
| download | emacs-ffe832ea680b4820f5ff399191f7f2d41350ee2e.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32fns.c | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 928a2d9fd42..71026e1d77e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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: diff --git a/src/w32fns.c b/src/w32fns.c index 838367fe399..ae6cc88ea6b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -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); |