From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 6 Feb 2013 12:38:02 +0000 (+0100)
Subject: updated for version 7.3.801
X-Git-Tag: v7.3.801
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=530e7dfafd7e951ac36e39c87bf72ebdb4caa428;p=vim

updated for version 7.3.801
Problem:    ":window set nu?" displays the cursor line. (Nazri Ramliy)
Solution:   Do not update the cursor line when conceallevel is zero or the
            screen has scrolled. (partly by Christian Brabandt)
---

diff --git a/src/version.c b/src/version.c
index af8210a9d..69184b05a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    801,
 /**/
     800,
 /**/
diff --git a/src/window.c b/src/window.c
index b5d4afd2b..1a09c9145 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3991,9 +3991,10 @@ win_goto(wp)
 
 #ifdef FEAT_CONCEAL
     /* Conceal cursor line in previous window, unconceal in current window. */
-    if (win_valid(owp))
+    if (win_valid(owp) && owp->w_p_cole > 0 && !msg_scrolled)
 	update_single_line(owp, owp->w_cursor.lnum);
-    update_single_line(curwin, curwin->w_cursor.lnum);
+    if (curwin->w_p_cole > 0 && !msg_scrolled)
+	need_cursor_line_redraw = TRUE;
 #endif
 }