# HG changeset patch # User Juanma Barranquero # Date 1227799180 0 # Node ID fed2622a8defe9b7c75381d2b5e2781e9de49757 # Parent d82e6f4a6d1341ab392df3a82dbc06a397a0926e * w32font.c (add_font_entity_to_list): Pass the right LOGFONT pointer to check_face_name. diff -r d82e6f4a6d13 -r fed2622a8def src/ChangeLog --- 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 + + * w32font.c (add_font_entity_to_list): Pass the right LOGFONT + pointer to check_face_name. + 2008-11-27 Kenichi Handa * category.h (SET_CATEGORY_SET): Call set_category_set. diff -r d82e6f4a6d13 -r fed2622a8def src/w32font.c --- 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,