aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2013-09-03 16:02:01 +0400
committerDmitry Antipov2013-09-03 16:02:01 +0400
commitd1ae6a0bca4368d17a031c6339f0ba52b5a958d3 (patch)
treef24b3bf96083a82f969be4d30b5a3c3d0173cbfa /src
parentd1fc6c21a839c98b0285e7af2537f114b13aa835 (diff)
downloademacs-d1ae6a0bca4368d17a031c6339f0ba52b5a958d3.tar.gz
emacs-d1ae6a0bca4368d17a031c6339f0ba52b5a958d3.zip
* xterm.h (struct x_output): Remove set-but-unused
leftovers 'left_before_move' and 'top_before_move'. * xterm.c (x_set_offset): User changed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xterm.c3
-rw-r--r--src/xterm.h5
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 @@
2 2
3 * xterm.h (struct scroll_bar): Prefer int to Lisp_Object 3 * xterm.h (struct scroll_bar): Prefer int to Lisp_Object
4 for 'dragging' member. 4 for 'dragging' member.
5 (struct x_output): Remove set-but-unused leftovers
6 'left_before_move' and 'top_before_move'.
5 * gtkutil.c (xg_set_toolkit_scroll_bar_thumb): 7 * gtkutil.c (xg_set_toolkit_scroll_bar_thumb):
6 * xterm.c (xt_action_hook, xm_scroll_callback, xg_scroll_callback) 8 * xterm.c (xt_action_hook, xm_scroll_callback, xg_scroll_callback)
7 (xg_end_scroll_callback, xaw_jump_callback, xaw_scroll_callback) 9 (xg_end_scroll_callback, xaw_jump_callback, xaw_scroll_callback)
8 (x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create) 10 (x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
9 (x_scroll_bar_set_handle, XTset_vertical_scroll_bar) 11 (x_scroll_bar_set_handle, XTset_vertical_scroll_bar)
10 (x_scroll_bar_handle_click, x_scroll_bar_note_movement) 12 (x_scroll_bar_handle_click, x_scroll_bar_note_movement)
11 (x_scroll_bar_report_motion): Related users changed. 13 (x_scroll_bar_report_motion, x_set_offset): Related users changed.
12 14
132013-09-03 Jan Djärv <jan.h.d@swipnet.se> 152013-09-03 Jan Djärv <jan.h.d@swipnet.se>
14 16
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_
8116 8116
8117 if (change_gravity > 0) 8117 if (change_gravity > 0)
8118 { 8118 {
8119 FRAME_X_OUTPUT (f)->left_before_move = f->left_pos;
8120 FRAME_X_OUTPUT (f)->top_before_move = f->top_pos;
8121
8122 f->top_pos = yoff; 8119 f->top_pos = yoff;
8123 f->left_pos = xoff; 8120 f->left_pos = xoff;
8124 f->size_hint_flags &= ~ (XNegative | YNegative); 8121 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
626 int move_offset_top; 626 int move_offset_top;
627 int move_offset_left; 627 int move_offset_left;
628 628
629 /* The frame's left/top offsets before we call XMoveWindow. See
630 x_check_expected_move. */
631 int left_before_move;
632 int top_before_move;
633
634 /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */ 629 /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */
635 unsigned net_wm_state_hidden_seen : 1; 630 unsigned net_wm_state_hidden_seen : 1;
636}; 631};