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 @@
 2011-04-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * xterm.c (x_scroll_bar_to_input_event) [!USE_GTK]:
+        Remove var that is set but not used.
+
         * xfaces.c (realize_named_face): Remove vars that are set but not used.
         (map_tty_color) [!defined MSDOS]: Likewise.
 
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)
 {
   XClientMessageEvent *ev = (XClientMessageEvent *) event;
   Lisp_Object window;
-  struct frame *f;
   struct window *w;
 
   w = scroll_bar_windows[ev->data.l[0]];
   scroll_bar_windows[ev->data.l[0]] = NULL;
 
   XSETWINDOW (window, w);
-  f = XFRAME (w->frame);
 
   ievent->kind = SCROLL_BAR_CLICK_EVENT;
   ievent->frame_or_window = window;
@@ -4255,7 +4253,8 @@ x_scroll_bar_to_input_event (XEvent *event, struct input_event *ievent)
 #ifdef USE_GTK
   ievent->timestamp = CurrentTime;
 #else
-  ievent->timestamp = XtLastTimestampProcessed (FRAME_X_DISPLAY (f));
+  ievent->timestamp =
+    XtLastTimestampProcessed (FRAME_X_DISPLAY (XFRAME (w->frame)));
 #endif
   ievent->part = ev->data.l[1];
   ievent->code = ev->data.l[2];