diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xftfont.c | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e1c85624573..d6f258ed156 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-10-27 Dmitry Antipov <dmantipov@yandex.ru> + + * 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 <eliz@gnu.org> * emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments diff --git a/src/xftfont.c b/src/xftfont.c index 1e03dd320fe..37b33b3ead8 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -58,7 +58,6 @@ struct xftfont_info int index; FT_Matrix matrix; Display *display; - int screen; XftFont *xftfont; }; @@ -70,11 +69,6 @@ struct xftface_info 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_open (struct frame *f, Lisp_Object entity, int pixel_size) 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; |