# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1401269737 -7200
# Node ID e3d2b8d83bb30c428a051f50791e454fcbc080af
# Parent  54d96e3b2eec759817fe09084c0d3d3ab770e461
updated for version 7.4.308
Problem:    When using ":diffsplit" on an empty file the cursor is displayed
	    on the command line.
Solution:   Limit the value of w_topfill.

diff --git a/src/diff.c b/src/diff.c
--- a/src/diff.c
+++ b/src/diff.c
@@ -622,6 +622,7 @@ diff_redraw(dofold)
 		    wp->w_topfill = (n < 0 ? 0 : n);
 		else if (n > 0 && n > wp->w_topfill)
 		    wp->w_topfill = n;
+		check_topfill(wp, FALSE);
 	    }
 	}
 }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    308,
+/**/
     307,
 /**/
     306,