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

diff --git a/src/screen.c b/src/screen.c
index de405e14c269657a650deb0a1495b1354e95a3a4..ac531d4858ca342b6807db967e7724fdb18da722 100644 (file)
--- 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;
                }
            }