Karsten Hopp a136cf
To: vim_dev@googlegroups.com
Karsten Hopp a136cf
Subject: Patch 7.3.801
Karsten Hopp a136cf
Fcc: outbox
Karsten Hopp a136cf
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp a136cf
Mime-Version: 1.0
Karsten Hopp a136cf
Content-Type: text/plain; charset=UTF-8
Karsten Hopp a136cf
Content-Transfer-Encoding: 8bit
Karsten Hopp a136cf
------------
Karsten Hopp a136cf
Karsten Hopp a136cf
Patch 7.3.801
Karsten Hopp a136cf
Problem:    ":window set nu?" displays the cursor line. (Nazri Ramliy)
Karsten Hopp a136cf
Solution:   Do not update the cursor line when conceallevel is zero or the
Karsten Hopp a136cf
	    screen has scrolled. (partly by Christian Brabandt)
Karsten Hopp a136cf
Files:	    src/window.c
Karsten Hopp a136cf
Karsten Hopp a136cf
Karsten Hopp a136cf
*** ../vim-7.3.800/src/window.c	2013-01-17 13:59:56.000000000 +0100
Karsten Hopp a136cf
--- src/window.c	2013-02-06 13:28:10.000000000 +0100
Karsten Hopp a136cf
***************
Karsten Hopp a136cf
*** 3991,3999 ****
Karsten Hopp a136cf
  
Karsten Hopp a136cf
  #ifdef FEAT_CONCEAL
Karsten Hopp a136cf
      /* Conceal cursor line in previous window, unconceal in current window. */
Karsten Hopp a136cf
!     if (win_valid(owp))
Karsten Hopp a136cf
  	update_single_line(owp, owp->w_cursor.lnum);
Karsten Hopp a136cf
!     update_single_line(curwin, curwin->w_cursor.lnum);
Karsten Hopp a136cf
  #endif
Karsten Hopp a136cf
  }
Karsten Hopp a136cf
  
Karsten Hopp a136cf
--- 3991,4000 ----
Karsten Hopp a136cf
  
Karsten Hopp a136cf
  #ifdef FEAT_CONCEAL
Karsten Hopp a136cf
      /* Conceal cursor line in previous window, unconceal in current window. */
Karsten Hopp a136cf
!     if (win_valid(owp) && owp->w_p_cole > 0 && !msg_scrolled)
Karsten Hopp a136cf
  	update_single_line(owp, owp->w_cursor.lnum);
Karsten Hopp a136cf
!     if (curwin->w_p_cole > 0 && !msg_scrolled)
Karsten Hopp a136cf
! 	need_cursor_line_redraw = TRUE;
Karsten Hopp a136cf
  #endif
Karsten Hopp a136cf
  }
Karsten Hopp a136cf
  
Karsten Hopp a136cf
*** ../vim-7.3.800/src/version.c	2013-02-06 12:33:15.000000000 +0100
Karsten Hopp a136cf
--- src/version.c	2013-02-06 13:32:28.000000000 +0100
Karsten Hopp a136cf
***************
Karsten Hopp a136cf
*** 727,728 ****
Karsten Hopp a136cf
--- 727,730 ----
Karsten Hopp a136cf
  {   /* Add new patch number below this line */
Karsten Hopp a136cf
+ /**/
Karsten Hopp a136cf
+     801,
Karsten Hopp a136cf
  /**/
Karsten Hopp a136cf
Karsten Hopp a136cf
-- 
Karsten Hopp a136cf
ARTHUR:          But if he was dying, he wouldn't bother to carve
Karsten Hopp a136cf
                 "Aaaaarrrrrrggghhh".  He'd just say it.
Karsten Hopp a136cf
BROTHER MAYNARD: It's down there carved in stone.
Karsten Hopp a136cf
GALAHAD:         Perhaps he was dictating.
Karsten Hopp a136cf
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp a136cf
Karsten Hopp a136cf
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp a136cf
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp a136cf
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp a136cf
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///