From fa1d9301f7f1c2b4ea426125e513d3724394df49 Mon Sep 17 00:00:00 2001
From: Will Stamper <epmatsw@gmail.com>
Date: Thu, 12 Jun 2014 22:57:48 -0500
Subject: [PATCH] vim-patch:7.4.308 #832

Problem:    When using ":diffsplit" on an empty file the cursor is displayed
            on the command line.
Solution:   Limit the value of w_topfill.

https://code.google.com/p/vim/source/detail?r=e3d2b8d83bb30c428a051f50791e454fcbc080af
---
 src/nvim/diff.c    | 1 +
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 20b40a7864..e7feacd4fb 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -598,6 +598,7 @@ static void diff_redraw(int dofold)
         } else if ((n > 0) && (n > wp->w_topfill)) {
           wp->w_topfill = n;
         }
+        check_topfill(wp, FALSE);
       }
     }
   }
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6629640b45..9824b34d52 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -210,7 +210,7 @@ static int included_patches[] = {
   //311,
   //310,
   //309,
-  //308,
+  308,
   //307,
   306,
   //305,