(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 5aa036ec810ac614e202e289a8cc489a781ac9de..3d8fa95f2fe8f94dd52e368d3e8ec6960e149586 100644 (file)
--- 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.  */