From bc6cf6c5117d9ef19904c6fb56a2a45faa33afdb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 22 May 2014 15:51:04 +0200 Subject: 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) --- src/screen.c | 12 ++++++------ src/version.c | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/screen.c b/src/screen.c index cdb416d03..78e439944 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3553,11 +3553,7 @@ win_line(wp, lnum, startrow, endrow, nochange) 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, nochange) 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 index 7f58182fd..1c1aa2b39 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 */ +/**/ + 302, /**/ 301, /**/ -- cgit v1.2.1