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

[Kenichi Handa]

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

Index: xfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfont.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- xfont.c     5 Jun 2008 04:15:44 -0000       1.14
+++ xfont.c     9 Jul 2008 00:31:26 -0000       1.15
@@ -564,13 +564,11 @@
   if (! xfont)
     return Qnil;
 
-  font_object = font_make_object (VECSIZE (struct xfont_info));
+  font_object = font_make_object (VECSIZE (struct xfont_info),
+                                 entity, pixel_size);
   ASET (font_object, FONT_TYPE_INDEX, Qx);
   if (STRINGP (fullname))
     font_parse_xlfd ((char *) SDATA (fullname), font_object);
-  for (i = 1; i < FONT_ENTITY_MAX; i++)
-    ASET (font_object, i, AREF (entity, i));
-  ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
   if (STRINGP (fullname))
     ASET (font_object, FONT_NAME_INDEX, fullname);
   else
@@ -650,10 +648,7 @@
 
   if (NILP (fullname))
     fullname = AREF (font_object, FONT_NAME_INDEX);
-  font->vertical_centering
-    = (STRINGP (Vvertical_centering_font_regexp)
-       && (fast_string_match_ignore_case
-          (Vvertical_centering_font_regexp, fullname) >= 0));
+  font->vertical_centering = 0;
 
   return font_object;
 }