From d1ae6a0bca4368d17a031c6339f0ba52b5a958d3 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 3 Sep 2013 16:02:01 +0400 Subject: [PATCH] * xterm.h (struct x_output): Remove set-but-unused leftovers 'left_before_move' and 'top_before_move'. * xterm.c (x_set_offset): User changed. --- src/ChangeLog | 4 +++- src/xterm.c | 3 --- src/xterm.h | 5 ----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5d8f2e10099..387a2883adb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,13 +2,15 @@ * xterm.h (struct scroll_bar): Prefer int to Lisp_Object for 'dragging' member. + (struct x_output): Remove set-but-unused leftovers + 'left_before_move' and 'top_before_move'. * gtkutil.c (xg_set_toolkit_scroll_bar_thumb): * xterm.c (xt_action_hook, xm_scroll_callback, xg_scroll_callback) (xg_end_scroll_callback, xaw_jump_callback, xaw_scroll_callback) (x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create) (x_scroll_bar_set_handle, XTset_vertical_scroll_bar) (x_scroll_bar_handle_click, x_scroll_bar_note_movement) - (x_scroll_bar_report_motion): Related users changed. + (x_scroll_bar_report_motion, x_set_offset): Related users changed. 2013-09-03 Jan Djärv diff --git a/src/xterm.c b/src/xterm.c index 7b580b24986..bd990014cea 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8116,9 +8116,6 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_ if (change_gravity > 0) { - FRAME_X_OUTPUT (f)->left_before_move = f->left_pos; - FRAME_X_OUTPUT (f)->top_before_move = f->top_pos; - f->top_pos = yoff; f->left_pos = xoff; f->size_hint_flags &= ~ (XNegative | YNegative); diff --git a/src/xterm.h b/src/xterm.h index c1a9873a381..c579d342215 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -626,11 +626,6 @@ struct x_output int move_offset_top; int move_offset_left; - /* The frame's left/top offsets before we call XMoveWindow. See - x_check_expected_move. */ - int left_before_move; - int top_before_move; - /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */ unsigned net_wm_state_hidden_seen : 1; }; -- 2.11.4.GIT