From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 20 Jul 2010 09:29:07 +0000 (+0200)
Subject: Fix 'colorcolumn' adjecent columns not highlighted after end of line.
X-Git-Tag: v7.3~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=973bd47c488b5020947d819f3cb9040ff83f347c;p=vim

Fix 'colorcolumn' adjecent columns not highlighted after end of line.
---

diff --git a/src/screen.c b/src/screen.c
index de405e14c..ac531d485 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4715,6 +4715,10 @@ win_line(wp, lnum, startrow, endrow, nochange)
 			ScreenLinesUC[off] = 0;
 #endif
 		    ++col;
+		    if (draw_color_col)
+			draw_color_col = advance_color_col(VCOL_HLC,
+								 &color_cols);
+
 		    if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol)
 			ScreenAttrs[off++] = hl_attr(HLF_CUC);
 		    else if (draw_color_col && VCOL_HLC == *color_cols)
@@ -4725,10 +4729,6 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		    if (VCOL_HLC >= rightmost_vcol)
 			break;
 
-		    if (draw_color_col)
-			draw_color_col = advance_color_col(VCOL_HLC,
-								 &color_cols);
-
 		    ++vcol;
 		}
 	    }