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)
diff --git a/src/screen.c b/src/screen.c
index 1addd0a..fd15ad1 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2740,6 +2740,28 @@
}
#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)
{
diff --git a/src/version.c b/src/version.c
index f9b47b1..c721e07 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 667,
+/**/
666,
/**/
665,