Mercurial > emacs
changeset 96563:5deb199cf917
(w32font_open): Adjust it for the change of
font_make_object.
(w32font_open_internal): Don't set properties of font_object here.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 09 Jul 2008 00:32:22 +0000 |
| parents | ea11c7e02573 |
| children | 9ee160a11a03 |
| files | src/w32font.c |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32font.c Wed Jul 09 00:32:01 2008 +0000 +++ b/src/w32font.c Wed Jul 09 00:32:22 2008 +0000 @@ -236,7 +236,8 @@ { Lisp_Object font_object; - font_object = font_make_object (VECSIZE (struct w32font_info)); + font_object = font_make_object (VECSIZE (struct w32font_info), + font_entity, pixel_size); if (!w32font_open_internal (f, font_entity, pixel_size, font_object)) { @@ -802,11 +803,6 @@ if (!font) return 0; - /* Copy from font entity. */ - for (i = 0; i < FONT_ENTITY_MAX; i++) - ASET (font_object, i, AREF (font_entity, i)); - ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size)); - bzero (&logfont, sizeof (logfont)); fill_in_logfont (f, &logfont, font_entity);