# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1400766664 -7200
# Node ID df141c80ea3a1ffcbf82d05c1314675231fcfa75
# Parent  822f24a92ea8d7c7df5d8b3346b3ccf9da05c3df
updated for version 7.4.302
Problem:    Signs placed with 'foldcolumn' set don't show up after filler
	    lines.
Solution:   Take filler lines into account. (Olaf Dabrunz)

diff --git a/src/screen.c b/src/screen.c
--- a/src/screen.c
+++ b/src/screen.c
@@ -3553,11 +3553,7 @@ win_line(wp, lnum, startrow, endrow, noc
 		draw_state = WL_SIGN;
 		/* Show the sign column when there are any signs in this
 		 * buffer or when using Netbeans. */
-		if (draw_signcolumn(wp)
-# ifdef FEAT_DIFF
-			&& filler_todo <= 0
-# endif
-		   )
+		if (draw_signcolumn(wp))
 		{
 		    int	text_sign;
 # ifdef FEAT_SIGN_ICONS
@@ -3569,7 +3565,11 @@ win_line(wp, lnum, startrow, endrow, noc
 		    char_attr = hl_attr(HLF_SC);
 		    n_extra = 2;
 
-		    if (row == startrow)
+		    if (row == startrow
+#ifdef FEAT_DIFF
+			    + filler_lines && filler_todo <= 0
+#endif
+			    )
 		    {
 			text_sign = buf_getsigntype(wp->w_buffer, lnum,
 								   SIGN_TEXT);
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 */
 /**/
+    302,
+/**/
     301,
 /**/
     300,