thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.4.667

Browse Source 
Problem:    'colorcolumn' isn't drawn in a closed fold while 'cursorcolumn'
            is. (Carlos Pita)
Solution:   Make it consistent. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2015-03-20 17:16:27 +01:00
parent b1fc2bf29c
commit fbc25b20cb
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/screen.c
View File

@ -2740,6 +2740,28 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
}
#ifdef FEAT_SYN_HL
/* Show colorcolumn in the fold line, but let cursorcolumn override it. */
if (wp->w_p_cc_cols)
{
int i = 0;
int j = wp->w_p_cc_cols[i];
int old_txtcol = txtcol;
while (j > -1)
{
txtcol += j;
if (wp->w_p_wrap)
txtcol -= wp->w_skipcol;
else
txtcol -= wp->w_leftcol;
if (txtcol >= 0 && txtcol < W_WIDTH(wp))
ScreenAttrs[off + txtcol] = hl_combine_attr(
ScreenAttrs[off + txtcol], hl_attr(HLF_MC));
txtcol = old_txtcol;
j = wp->w_p_cc_cols[++i];
}
}
/* Show 'cursorcolumn' in the fold line. */
if (wp->w_p_cuc)
{

2
src/version.c
View File

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