--- rxvt-unicode/src/scrollbar.C	2005/12/18 00:59:42	1.26
+++ rxvt-unicode/src/scrollbar.C	2005/12/31 17:16:17	1.28
@@ -155,9 +155,9 @@
 
   if (update)
     {
-      top = nscrolled - view_start;
+      top = nsaved - view_start;
       bot = top + (nrow - 1);
-      len = max (nscrolled + (nrow - 1), 1);
+      len = max (nsaved + (nrow - 1), 1);
       adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
 
       scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
@@ -232,7 +232,7 @@
       width = min (i, SB_WIDTH_MAXIMUM);
 
 # if defined(RXVT_SCROLLBAR)
-  if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT)
+  if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
     sb_shadow = SHADOW;
 # endif