updated for version 7.2-023
diff --git a/src/screen.c b/src/screen.c
index 45ccf00..684c394 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2439,9 +2439,17 @@
#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 c3c9347..0ed7da1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 23,
+/**/
22,
/**/
21,