# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1120408908 0
# Node ID 5ce023c9db0d316392a10897a4ebc57920a86fde
# Parent  4133ed695908f2786b9244b98c631e797eb33034
(window_scroll_pixel_based): Take account of this_scroll_margin when
finding point when scrolling up.

diff -r 4133ed695908 -r 5ce023c9db0d src/window.c
--- a/src/window.c	Sun Jul 03 16:40:12 2005 +0000
+++ b/src/window.c	Sun Jul 03 16:41:48 2005 +0000
@@ -4822,7 +4822,9 @@
       /* We moved the window start towards BEGV, so PT may be now
 	 in the scroll margin at the bottom.  */
       move_it_to (&it, PT, -1,
-		  it.last_visible_y - this_scroll_margin - 1, -1,
+		  (it.last_visible_y - CURRENT_HEADER_LINE_HEIGHT (w)
+		   - this_scroll_margin - 1),
+		  -1,
 		  MOVE_TO_POS | MOVE_TO_Y);
 
       /* Save our position, in case it's correct.  */