Mercurial > emacs
changeset 99989:fed2622a8def
* w32font.c (add_font_entity_to_list): Pass the right LOGFONT
pointer to check_face_name.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 27 Nov 2008 15:19:40 +0000 |
| parents | d82e6f4a6d13 |
| children | 95d87a7d19c6 |
| files | src/ChangeLog src/w32font.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Nov 27 13:20:15 2008 +0000 +++ b/src/ChangeLog Thu Nov 27 15:19:40 2008 +0000 @@ -1,3 +1,8 @@ +2008-11-27 Juanma Barranquero <lekktu@gmail.com> + + * w32font.c (add_font_entity_to_list): Pass the right LOGFONT + pointer to check_face_name. + 2008-11-27 Kenichi Handa <handa@m17n.org> * category.h (SET_CATEGORY_SET): Call set_category_set.
--- a/src/w32font.c Thu Nov 27 13:20:15 2008 +0000 +++ b/src/w32font.c Thu Nov 27 15:19:40 2008 +0000 @@ -447,7 +447,7 @@ /* For non-truetype fonts, GetGlyphOutlineW is not supported, so fallback on other methods that will at least give some of the metric information. */ - + /* Make array big enough to hold surrogates. */ wcode = alloca (nglyphs * sizeof (WORD) * 2); for (i = 0; i < nglyphs; i++) @@ -812,7 +812,7 @@ if (!metrics) GetTextMetricsW (dc, &w32_font->metrics); - + w32_font->cached_metrics = NULL; w32_font->n_cache_blocks = 0; @@ -843,7 +843,7 @@ } font->max_width = w32_font->metrics.tmMaxCharWidth; - /* Parts of Emacs display assume that height = ascent + descent... + /* Parts of Emacs display assume that height = ascent + descent... so height is defined later, after ascent and descent. font->height = w32_font->metrics.tmHeight + w32_font->metrics.tmExternalLeading; @@ -1382,7 +1382,8 @@ /* Check for well known substitutions that mess things up in the presence of Type-1 fonts of the same name. */ && (match_data->pattern.lfFaceName[0] - && check_face_name (logical_font, logical_font->elfFullName))) + && check_face_name (&logical_font->elfLogFont, + logical_font->elfFullName))) { Lisp_Object entity = w32_enumfont_pattern_entity (match_data->frame, logical_font,