updated for version 7.2-277
diff --git a/src/move.c b/src/move.c
index abf055f..26ff3bf 100644
--- a/src/move.c
+++ b/src/move.c
@@ -183,9 +183,6 @@
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 @@
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 5888b2d..ee69469 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 277,
+/**/
276,
/**/
275,
