[Emacs-diffs] trunk r114820: * xftfont.c (struct xftfont_info): Remove set-but-unused

[Dmitry Antipov]

------------------------------------------------------------
revno: 114820
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-27 09:30:34 +0400
message:
  * xftfont.c (struct xftfont_info): Remove set-but-unused
  'screen' member.
  (xftfont_open): Adjust user.
  (xftfont_get_colors): Remove useless prototype.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xftfont.c                  xftfont.c-20091113204419-o5vbwnq5f7feedwu-8548

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-26 13:43:58 +0000
+++ b/src/ChangeLog     2013-10-27 05:30:34 +0000
@@ -1,3 +1,10 @@
+2013-10-27  Dmitry Antipov  <address@hidden>
+
+       * xftfont.c (struct xftfont_info): Remove set-but-unused
+       'screen' member.
+       (xftfont_open): Adjust user.
+       (xftfont_get_colors): Remove useless prototype.
+
 2013-10-26  Eli Zaretskii  <address@hidden>
 
        * emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2013-10-25 06:55:36 +0000
+++ b/src/xftfont.c     2013-10-27 05:30:34 +0000
@@ -58,7 +58,6 @@
   int index;
   FT_Matrix matrix;
   Display *display;
-  int screen;
   XftFont *xftfont;
 };
 
@@ -70,11 +69,6 @@
   XftColor xft_bg;             /* color for face->background */
 };
 
-static void xftfont_get_colors (struct frame *, struct face *, GC gc,
-                                struct xftface_info *,
-                                XftColor *fg, XftColor *bg);
-
-
 /* Setup foreground and background colors of GC into FG and BG.  If
    XFTFACE_INFO is not NULL, reuse the colors in it if possible.  BG
    may be NULL.  */
@@ -377,7 +371,6 @@
 
   xftfont_info = (struct xftfont_info *) font;
   xftfont_info->display = display;
-  xftfont_info->screen = FRAME_X_SCREEN_NUMBER (f);
   xftfont_info->xftfont = xftfont;
   /* This means that there's no need of transformation.  */
   xftfont_info->matrix.xx = 0;