From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 3 Jul 2005 16:41:48 +0000 (+0000)
Subject: (window_scroll_pixel_based): Take account of this_scroll_margin when
X-Git-Tag: emacs-pretest-22.0.90~8484
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ad532392bbea95055f32eb73740fef4992d8c8c;p=emacs.git

(window_scroll_pixel_based): Take account of this_scroll_margin when
finding point when scrolling up.
---

diff --git a/src/window.c b/src/window.c
index 5aa036ec810..3d8fa95f2fe 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4822,7 +4822,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
       /* 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.  */