[Emacs-diffs] Changes to emacs/src/w32font.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/07/09 00:32:22

Index: w32font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32font.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- w32font.c   1 Jul 2008 14:00:42 -0000       1.45
+++ w32font.c   9 Jul 2008 00:32:22 -0000       1.46
@@ -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);