Mercurial > vim
changeset 5921:df141c80ea3a v7.4.302
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 22 May 2014 15:51:04 +0200 |
| parents | 822f24a92ea8 |
| children | 7c64a9da0bde |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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);