From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 18 Jul 2010 21:30:34 +0000 (+0200)
Subject: Fix: 'colorcolumn' interfered with concealed text.
X-Git-Tag: v7.3~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d160c3401988381254a07417f92933821381ba3c;p=thirdparty%2Fvim.git

Fix: 'colorcolumn' interfered with concealed text.
---

diff --git a/src/screen.c b/src/screen.c
index 74898f82dd..508e627058 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4806,7 +4806,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		vcol_save_attr = char_attr;
 		char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC));
 	    }
-	    else if (draw_color_col && vcol == *color_cols)
+	    else if (draw_color_col && VCOL_HLC == *color_cols)
 	    {
 		vcol_save_attr = char_attr;
 		char_attr = hl_combine_attr(char_attr, hl_attr(HLF_MC));