From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 28 May 2014 09:35:37 +0000 (+0200)
Subject: updated for version 7.4.308
X-Git-Tag: v7.4.308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=846a2ff5f3a006fb612d1ece1962cb75ca06d0fe;p=vim

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
index 49ca58af7..98b791a72 100644
--- 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
index 41f1b46f2..f72ae97f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    308,
 /**/
     307,
 /**/