(XTread_socket) <Expose> [!USE_TOOLKIT_SCROLL_BARS]: Fix

the change from 2001-04-30.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6dd403357e7eeef1d62ae49e1a9c3d7e83bb4af8..87d0a82077d5e8dadafa39d2034171d677e111a8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * xterm.c (XTread_socket) <Expose> [!USE_TOOLKIT_SCROLL_BARS]: Fix
+       the change from 2001-04-30.
+
 2001-05-03  Gerd Moellmann  <gerd@gnu.org>
 
        * xfns.c (file_dialog_unmap_cb): New function.

diff --git a/src/xterm.c b/src/xterm.c
index a967774f57a138141ad7ada08e50a0460ba1eb36..6bc3ced3a90cefbff827c92d252d70e1f4ef0daa 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10025,6 +10025,9 @@ XTread_socket (sd, bufp, numchars, expected)
                }
              else
                {
+#ifndef USE_TOOLKIT_SCROLL_BARS
+                 struct scroll_bar *bar;
+#endif
 #if defined USE_X_TOOLKIT && defined USE_LUCID
                  /* Submenus of the Lucid menu bar aren't widgets
                     themselves, so there's no way to dispatch events
@@ -10041,8 +10044,7 @@ XTread_socket (sd, bufp, numchars, expected)
                  /* Dispatch event to the widget.  */
                  goto OTHER;
 #else /* not USE_TOOLKIT_SCROLL_BARS */
-                 struct scroll_bar *bar
-                   = x_window_to_scroll_bar (event.xexpose.window);
+                 bar = x_window_to_scroll_bar (event.xexpose.window);
 
                  if (bar)
                    x_scroll_bar_expose (bar, &event);