Remove scrollbar_len from rxvt_term and make it a local variable in

scrollbar_show.

diff --git a/src/rxvt.h b/src/rxvt.h
index 750b527bd0fb74d47f9c872651a3f148a327c0f5..c8673691258f36e642be8680560ceeb22cc73044 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1009,7 +1009,6 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
                   last_bot,   /* scrollbar last bottom position            */
                   last_top,   /* scrollbar last top position               */
                   last_state, /* scrollbar last state                      */
-                  scrollbar_len,
                   window_vt_x,
                   window_vt_y,
                   window_sb_x,

diff --git a/src/scrollbar.C b/src/scrollbar.C
index 0ff57d4a778368c454433b9f4a10f311cd3da362..e0a23ed0c3521f90c0b2d05368e94ed1ac4ca9db 100644 (file)
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -147,6 +147,7 @@ rxvt_term::scrollbar_show (int update)
   int             ret = 0;
 #ifdef HAVE_SCROLLBARS
   int             top, bot, len, adj;
+  int             scrollbar_len = 0;
 
   if (!scrollBar.state)
     return 0;