Mercurial > vim

changeset 4094:48b54c590dc8 v7.3.801

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 06 Feb 2013 13:38:02 +0100
parents 8fa7167b26d7
children 5fc66eef634a
files src/version.c src/window.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    801,
+/**/
     800,
 /**/
     799,
--- 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
 }