To: vim-dev@vim.org
Subject: Patch 6.1.298
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.298
Problem:    When using signs and the first line of a closed fold has a sign
	    it can be redrawn as if the fold was open.  (Kamil Burzynski)
Solution:   Don't redraw a sign inside a closed fold.
Files:	    src/screen.c


*** ../vim61.297/src/screen.c	Tue Jan 14 10:38:37 2003
--- src/screen.c	Fri Jan 17 22:42:19 2003
***************
*** 583,594 ****
  		row = 0;
  		for (j = 0; j < wp->w_lines_valid; ++j)
  		{
- 		    /* Ignore folding, a closed fold with a sign doesn't need
- 		     * updating. */
  		    if (lnum == wp->w_lines[j].wl_lnum)
  		    {
! 			screen_start();	/* not sure of screen cursor */
! 			win_line(wp, lnum, row, row + wp->w_lines[j].wl_size);
  			break;
  		    }
  		    row += wp->w_lines[j].wl_size;
--- 584,601 ----
  		row = 0;
  		for (j = 0; j < wp->w_lines_valid; ++j)
  		{
  		    if (lnum == wp->w_lines[j].wl_lnum)
  		    {
! # ifdef FEAT_FOLDING
! 			/* Ignore folding, a closed fold with a sign doesn't
! 			 * need updating. */
! 			if (!wp->w_lines[j].wl_folded)
! # endif
! 			{
! 			    screen_start();	/* not sure of screen cursor */
! 			    win_line(wp, lnum, row,
! 						row + wp->w_lines[j].wl_size);
! 			}
  			break;
  		    }
  		    row += wp->w_lines[j].wl_size;
*** ../vim61.297/src/version.c	Sun Jan 19 19:54:41 2003
--- src/version.c	Sun Jan 19 19:56:11 2003
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     298,
  /**/

-- 
Contrary to popular belief, it's often your clothing that gets promoted, not
you.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///