diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-07-09 00:32:22 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-07-09 00:32:22 +0000 |
| commit | ec6174cdaf99af1f91f69ba4aa516cfcc074fd70 (patch) | |
| tree | f53a309b7810179e4c374443f840b8f0163123fb /src/w32font.c | |
| parent | 0fce2b40e3db5539d57e136907218dd3ea4ba1ee (diff) | |
| download | emacs-ec6174cdaf99af1f91f69ba4aa516cfcc074fd70.tar.gz | |
(w32font_open): Adjust it for the change of
font_make_object.
(w32font_open_internal): Don't set properties of font_object here.
Diffstat (limited to 'src/w32font.c')
| -rw-r--r-- | src/w32font.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/w32font.c b/src/w32font.c index b6381129739..7be72bb49a8 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -236,7 +236,8 @@ w32font_open (f, font_entity, pixel_size) { 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 @@ w32font_open_internal (f, font_entity, pixel_size, font_object) 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); |