# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1215563542 0
# Node ID 5deb199cf9179ecea999ace5760406a6d82d7a22
# Parent  ea11c7e025731c544e6f00feeb2fd8a80861dfea
(w32font_open): Adjust it for the change of
font_make_object.
(w32font_open_internal): Don't set properties of font_object here.

diff -r ea11c7e02573 -r 5deb199cf917 src/w32font.c
--- 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);