From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 24 Jul 2010 11:31:09 +0000 (+0200)
Subject: Another conceal fix: cursor in wrong column when 'number' set.
X-Git-Tag: v7.3~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f691b84fba95ffc24ea6725a625aa958a24ccffb;p=thirdparty%2Fvim.git

Another conceal fix: cursor in wrong column when 'number' set.
---

diff --git a/src/screen.c b/src/screen.c
index b7f4f408ed..70805d5214 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4492,7 +4492,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
 #ifdef FEAT_CONCEAL
 	/* In the cursor line and we may be concealing characters: correct
 	 * the cursor column when we reach its position. */
-	if (!did_wcol && wp == curwin && lnum == wp->w_cursor.lnum
+	if (!did_wcol && draw_state == WL_LINE
+		&& wp == curwin && lnum == wp->w_cursor.lnum
 		&& conceal_cursor_line(wp)
 		&& (int)wp->w_virtcol <= vcol + n_skip)
 	{