commit 85595c58151436d416aaedfa6a6a3be08439c736
author Bram Moolenaar <Bram@vim.org> Thu Oct 02 16:04:05 2008 +0000
committer Bram Moolenaar <Bram@vim.org> Thu Oct 02 16:04:05 2008 +0000
tree b25ba3fd6d05770cfccb6c7b05d85a6411f25148
parent 34b6cb12091b6ad390689cc31a107481601c50d5

updated for version 7.2-023

src/screen.c

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),