updated for version 7.2-023

diff --git a/src/screen.c b/src/screen.c
index 45ccf0034a77ce06ed8533f47e630bc9bf29b16b..684c3942d48aebda10af4925addd26cb21ef3750 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -2439,9 +2439,17 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
 
 #ifdef FEAT_SYN_HL
     /* Show 'cursorcolumn' in the fold line. */
-    if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
-       ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
-                ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
+    if (wp->w_p_cuc)
+    {
+       txtcol += wp->w_virtcol;
+       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_CUC));
+    }
 #endif
 
     SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),

diff --git a/src/version.c b/src/version.c
index c3c93477ebd5d0635479994becee1a0cbaf63a25..0ed7da104d1fae8b0b155e5ba7bf0c746030f694 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    23,
 /**/
     22,
 /**/