diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-07-09 00:31:26 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-07-09 00:31:26 +0000 |
| commit | 947eecfbc93d502cc8fd1f01053bf3e118ddb74a (patch) | |
| tree | c6661139dda386d77ee4c0131576ca517961a478 /src/xfont.c | |
| parent | 51c135107bd997cf3782a64dc94042eabe13c438 (diff) | |
| download | emacs-947eecfbc93d502cc8fd1f01053bf3e118ddb74a.tar.gz | |
(xfont_open): Adjust it for the change of
font_make_object. Don't check Vvertical_centering_font_regexp
here.
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/xfont.c b/src/xfont.c index 8e11d204089..9e7d68d51b8 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -564,13 +564,11 @@ xfont_open (f, entity, pixel_size) 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 @@ xfont_open (f, entity, pixel_size) 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; } |