mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
updated for version 7.4.667
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:
22
src/screen.c
22
src/screen.c
@@ -2740,6 +2740,28 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FEAT_SYN_HL
|
#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. */
|
/* Show 'cursorcolumn' in the fold line. */
|
||||||
if (wp->w_p_cuc)
|
if (wp->w_p_cuc)
|
||||||
{
|
{
|
||||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
667,
|
||||||
/**/
|
/**/
|
||||||
666,
|
666,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user