Mercurial > hg > xemacs-beta

diff src/redisplay-output.c @ 282:c42ec1d1cded r21-0b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b39
author cvs
date Mon, 13 Aug 2007 10:33:18 +0200
parents c5d627a313b1
children 8626e4521993
line wrap: on
line diff
--- a/src/redisplay-output.c	Mon Aug 13 10:32:23 2007 +0200
+++ b/src/redisplay-output.c	Mon Aug 13 10:33:18 2007 +0200
@@ -1042,7 +1042,7 @@
   ypos2 = WINDOW_TEXT_BOTTOM (w);
 #ifdef HAVE_SCROLLBARS
   /* This adjustment is to catch the intersection of any scrollbars. */
-  if (f->windows_structure_changed && !f->scrollbar_on_top)
+  if (f->windows_structure_changed && NILP (w->scrollbar_on_top_p))
     ypos2 += window_scrollbar_height (w);
 #endif
 
@@ -1053,7 +1053,7 @@
 	  ypos1 = WINDOW_TEXT_TOP (w);
 #ifdef HAVE_SCROLLBARS
 	  /* This adjustment is to catch the intersection of any scrollbars. */
-	  if (f->windows_structure_changed && f->scrollbar_on_top)
+	  if (f->windows_structure_changed && !NILP (w->scrollbar_on_top_p))
 	    ypos1 -= window_scrollbar_height (w);
 #endif
 	}