[Emacs-diffs] /srv/bzr/emacs/trunk r110984: * xftfont.c (xftfont_open): Remove duplicate assignment.

[Chong Yidong]

------------------------------------------------------------
revno: 110984
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-23 14:23:28 +0800
message:
  * xftfont.c (xftfont_open): Remove duplicate assignment.
modified:
  src/ChangeLog
  src/xftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-22 09:32:32 +0000
+++ b/src/ChangeLog     2012-11-23 06:23:28 +0000
@@ -1,3 +1,7 @@
+2012-11-23  Chong Yidong  <address@hidden>
+
+       * xftfont.c (xftfont_open): Remove duplicate assignment.
+
 2012-11-22  Dmitry Antipov  <address@hidden>
 
        * alloc.c (Fgarbage_collect): Unblock input after clearing

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2012-09-23 08:44:20 +0000
+++ b/src/xftfont.c     2012-11-23 06:23:28 +0000
@@ -369,7 +369,7 @@
   ASET (font_object, FONT_FORMAT_INDEX,
        ftfont_font_format (xftfont->pattern, filename));
   font = XFONT_OBJECT (font_object);
-  font->pixel_size = pixel_size;
+  font->pixel_size = size;
   font->driver = &xftfont_driver;
   font->encoding_charset = font->repertory_charset = -1;
 
@@ -387,8 +387,6 @@
       xftfont_info->matrix.xy = 0x10000L * matrix->xy;
       xftfont_info->matrix.yx = 0x10000L * matrix->yx;
     }
-  font->pixel_size = size;
-  font->driver = &xftfont_driver;
   if (INTEGERP (AREF (entity, FONT_SPACING_INDEX)))
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else