updated for version 7.2-277

diff --git a/src/move.c b/src/move.c
index abf055f3c66a585386eb39a9acd612e1a417d810..26ff3bf4d610c3510e70d3ac81a425ad45f5a2b6 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -183,9 +183,6 @@ update_topline()
        if (curwin->w_topline != 1)
            redraw_later(NOT_VALID);
        curwin->w_topline = 1;
-#ifdef FEAT_DIFF
-       curwin->w_topfill = 0;
-#endif
        curwin->w_botline = 2;
        curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
 #ifdef FEAT_SCROLLBIND
@@ -1257,7 +1254,8 @@ scrolldown(line_count, byfold)
     while (line_count-- > 0)
     {
 #ifdef FEAT_DIFF
-       if (curwin->w_topfill < diff_check(curwin, curwin->w_topline))
+       if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)
+               && curwin->w_topfill < curwin->w_height - 1)
        {
            ++curwin->w_topfill;
            ++done;

diff --git a/src/version.c b/src/version.c
index 5888b2d3b8af0a1f025dee58da21cc7eecfa160f..ee69469ff06b9e1fdf07496f79747f74d89aa62b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    277,
 /**/
     276,
 /**/