1 files changed, 4 insertions, 3 deletions

diff --git a/src/window.c b/src/window.c
index 504dcd38357..08c3f32dff5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,6 +1,6 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
-   Copyright (C) 1985-1987, 1993-1998, 2000-2017 Free Software
+   Copyright (C) 1985-1987, 1993-1998, 2000-2018 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -5397,12 +5397,13 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, bool noerror)
       if (it.what == IT_EOB)
         partial_p =
           it.current_y + it.ascent + it.descent
-          > it.last_visible_y - WINDOW_HEADER_LINE_HEIGHT (w);
+          > it.last_visible_y - this_scroll_margin - WINDOW_HEADER_LINE_HEIGHT (w);
       else
         {
           move_it_by_lines (&it, 1);
           partial_p =
-            it.current_y > it.last_visible_y - WINDOW_HEADER_LINE_HEIGHT (w);
+            it.current_y
+            > it.last_visible_y - this_scroll_margin - WINDOW_HEADER_LINE_HEIGHT (w);
         }
 
       if (charpos == PT && !partial_p