# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1441727104 -7200
# Node ID 8a58dde655a83b5e9d6aa0c707150e7a2ac924c7
# Parent  976cdb9fb47054ad7cf9d8c6566954f1243855ca
commit https://github.com/vim/vim/commit/a09a2c5857ab854f0870573b5160da1964c905a2
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Sep 8 17:31:59 2015 +0200

    patch 7.4.856
    Problem:    "zt" still doesn't work well with filler lines. (Gary Johnson)
    Solution:   Check for filler lines above the cursor. (Christian Brabandt)

diff --git a/src/move.c b/src/move.c
--- a/src/move.c
+++ b/src/move.c
@@ -1751,12 +1751,10 @@ scroll_cursor_top(min_scroll, always)
     new_topline = top + 1;
 
 #ifdef FEAT_DIFF
-    /* used already contains the number of filler lines above, don't add it
+    /* "used" already contains the number of filler lines above, don't add it
      * again.
-     * TODO: if filler lines above new top are to be considered as context for
-     * the current window, leave next statement commented, else hide filler
-     * lines above cursor line, by adding them to extra */
-    /* extra += diff_check_fill(curwin, curwin->w_cursor.lnum); */
+     * Hide filler lines above cursor line by adding them to "extra". */
+    extra += diff_check_fill(curwin, curwin->w_cursor.lnum);
 #endif
 
     /*
@@ -1771,7 +1769,7 @@ scroll_cursor_top(min_scroll, always)
 	    i = 1;
 	else
 #endif
-	    i = plines(top);
+	    i = plines_nofill(top);
 	used += i;
 	if (extra + i <= off && bot < curbuf->b_ml.ml_line_count)
 	{
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    856,
+/**/
     855,
 /**/
     854,