0
0
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00

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)
This commit is contained in:
Bram Moolenaar 2014-05-22 15:51:04 +02:00
parent b42970535c
commit bc6cf6c511
2 changed files with 8 additions and 6 deletions

View File

@ -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);

View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
302,
/**/
301,
/**/