commit fa316dd1f710f446c820aab3b11cfc99c6e56f30
author Bram Moolenaar <Bram@vim.org> Tue Nov 03 15:23:14 2009 +0000
committer Bram Moolenaar <Bram@vim.org> Tue Nov 03 15:23:14 2009 +0000
tree 1877e51ad67076c74d849757841728e0a4f8613a
parent 2ac5e603d8e64970fac5794e8bf03ea8e2b6d473

updated for version 7.2-277

src/move.c

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;