diff options
| author | Paul Eggert | 2011-04-01 10:44:26 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-01 10:44:26 -0700 |
| commit | 9ae848fc4a017cbb0bfd22ebc5c11c2fe9e232a0 (patch) | |
| tree | 253ac553b1b6027c351d7193bcf0fe59aecc31d4 | |
| parent | a5a62657a2875e5f89e4aefd93df4023277426f6 (diff) | |
| download | emacs-9ae848fc4a017cbb0bfd22ebc5c11c2fe9e232a0.tar.gz emacs-9ae848fc4a017cbb0bfd22ebc5c11c2fe9e232a0.zip | |
* xterm.c (x_scroll_bar_to_input_event) [!USE_GTK]:
Remove var that is set but not used.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xterm.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9c1b17f8996..6a7f35f64f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-01 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-01 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xterm.c (x_scroll_bar_to_input_event) [!USE_GTK]: | ||
| 4 | Remove var that is set but not used. | ||
| 5 | |||
| 3 | * xfaces.c (realize_named_face): Remove vars that are set but not used. | 6 | * xfaces.c (realize_named_face): Remove vars that are set but not used. |
| 4 | (map_tty_color) [!defined MSDOS]: Likewise. | 7 | (map_tty_color) [!defined MSDOS]: Likewise. |
| 5 | 8 | ||
diff --git a/src/xterm.c b/src/xterm.c index dc1fd3cbbd1..6bfe503c97e 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -4240,14 +4240,12 @@ x_scroll_bar_to_input_event (XEvent *event, struct input_event *ievent) | |||
| 4240 | { | 4240 | { |
| 4241 | XClientMessageEvent *ev = (XClientMessageEvent *) event; | 4241 | XClientMessageEvent *ev = (XClientMessageEvent *) event; |
| 4242 | Lisp_Object window; | 4242 | Lisp_Object window; |
| 4243 | struct frame *f; | ||
| 4244 | struct window *w; | 4243 | struct window *w; |
| 4245 | 4244 | ||
| 4246 | w = scroll_bar_windows[ev->data.l[0]]; | 4245 | w = scroll_bar_windows[ev->data.l[0]]; |
| 4247 | scroll_bar_windows[ev->data.l[0]] = NULL; | 4246 | scroll_bar_windows[ev->data.l[0]] = NULL; |
| 4248 | 4247 | ||
| 4249 | XSETWINDOW (window, w); | 4248 | XSETWINDOW (window, w); |
| 4250 | f = XFRAME (w->frame); | ||
| 4251 | 4249 | ||
| 4252 | ievent->kind = SCROLL_BAR_CLICK_EVENT; | 4250 | ievent->kind = SCROLL_BAR_CLICK_EVENT; |
| 4253 | ievent->frame_or_window = window; | 4251 | ievent->frame_or_window = window; |
| @@ -4255,7 +4253,8 @@ x_scroll_bar_to_input_event (XEvent *event, struct input_event *ievent) | |||
| 4255 | #ifdef USE_GTK | 4253 | #ifdef USE_GTK |
| 4256 | ievent->timestamp = CurrentTime; | 4254 | ievent->timestamp = CurrentTime; |
| 4257 | #else | 4255 | #else |
| 4258 | ievent->timestamp = XtLastTimestampProcessed (FRAME_X_DISPLAY (f)); | 4256 | ievent->timestamp = |
| 4257 | XtLastTimestampProcessed (FRAME_X_DISPLAY (XFRAME (w->frame))); | ||
| 4259 | #endif | 4258 | #endif |
| 4260 | ievent->part = ev->data.l[1]; | 4259 | ievent->part = ev->data.l[1]; |
| 4261 | ievent->code = ev->data.l[2]; | 4260 | ievent->code = ev->data.l[2]; |