Commit ec6174cd authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(w32font_open): Adjust it for the change of

(w32font_open_internal): Don't set properties of font_object here.
parent 0fce2b40
...@@ -236,7 +236,8 @@ w32font_open (f, font_entity, pixel_size) ...@@ -236,7 +236,8 @@ w32font_open (f, font_entity, pixel_size)
{ {
Lisp_Object font_object; 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)) 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) ...@@ -802,11 +803,6 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
if (!font) if (!font)
return 0; 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)); bzero (&logfont, sizeof (logfont));
fill_in_logfont (f, &logfont, font_entity); fill_in_logfont (f, &logfont, font_entity);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment