Mercurial > emacs
changeset 96560:d87a9f1b9378
(xfont_open): Adjust it for the change of
font_make_object. Don't check Vvertical_centering_font_regexp
here.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 09 Jul 2008 00:31:26 +0000 |
| parents | 34bb8a9f2b7f |
| children | d7b47f09b693 |
| files | src/xfont.c |
| diffstat | 1 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfont.c Wed Jul 09 00:30:18 2008 +0000 +++ b/src/xfont.c Wed Jul 09 00:31:26 2008 +0000 @@ -564,13 +564,11 @@ if (! xfont) return Qnil; - font_object = font_make_object (VECSIZE (struct xfont_info)); + font_object = font_make_object (VECSIZE (struct xfont_info), + entity, pixel_size); ASET (font_object, FONT_TYPE_INDEX, Qx); if (STRINGP (fullname)) font_parse_xlfd ((char *) SDATA (fullname), font_object); - for (i = 1; i < FONT_ENTITY_MAX; i++) - ASET (font_object, i, AREF (entity, i)); - ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size)); if (STRINGP (fullname)) ASET (font_object, FONT_NAME_INDEX, fullname); else @@ -650,10 +648,7 @@ if (NILP (fullname)) fullname = AREF (font_object, FONT_NAME_INDEX); - font->vertical_centering - = (STRINGP (Vvertical_centering_font_regexp) - && (fast_string_match_ignore_case - (Vvertical_centering_font_regexp, fullname) >= 0)); + font->vertical_centering = 0; return font_object; }