Karsten Hopp 5111b4
To: vim-dev@vim.org
Karsten Hopp 5111b4
Subject: Patch 7.2.397
Karsten Hopp 5111b4
Fcc: outbox
Karsten Hopp 5111b4
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 5111b4
Mime-Version: 1.0
Karsten Hopp 5111b4
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 5111b4
Content-Transfer-Encoding: 8bit
Karsten Hopp 5111b4
------------
Karsten Hopp 5111b4
Karsten Hopp 5111b4
Patch 7.2.397
Karsten Hopp 5111b4
Problem:    Redundant check for w_lines_valid.
Karsten Hopp 5111b4
Solution:   Remove the if.  (Lech Lorens)
Karsten Hopp 5111b4
Files:	    src/fold.c
Karsten Hopp 5111b4
Karsten Hopp 5111b4
Karsten Hopp 5111b4
*** ../vim-7.2.396/src/fold.c	2010-02-24 14:34:10.000000000 +0100
Karsten Hopp 5111b4
--- src/fold.c	2010-03-17 13:03:00.000000000 +0100
Karsten Hopp 5111b4
***************
Karsten Hopp 5111b4
*** 1053,1067 ****
Karsten Hopp 5111b4
  {
Karsten Hopp 5111b4
      int		i;
Karsten Hopp 5111b4
  
Karsten Hopp 5111b4
!     if (win->w_lines_valid > 0)
Karsten Hopp 5111b4
! 	for (i = 0; i < win->w_lines_valid; ++i)
Karsten Hopp 5111b4
! 	    if (win->w_lines[i].wl_valid)
Karsten Hopp 5111b4
! 	    {
Karsten Hopp 5111b4
! 		if (lnum < win->w_lines[i].wl_lnum)
Karsten Hopp 5111b4
! 		    return -1;
Karsten Hopp 5111b4
! 		if (lnum <= win->w_lines[i].wl_lastlnum)
Karsten Hopp 5111b4
! 		    return i;
Karsten Hopp 5111b4
! 	    }
Karsten Hopp 5111b4
      return -1;
Karsten Hopp 5111b4
  }
Karsten Hopp 5111b4
  
Karsten Hopp 5111b4
--- 1053,1066 ----
Karsten Hopp 5111b4
  {
Karsten Hopp 5111b4
      int		i;
Karsten Hopp 5111b4
  
Karsten Hopp 5111b4
!     for (i = 0; i < win->w_lines_valid; ++i)
Karsten Hopp 5111b4
! 	if (win->w_lines[i].wl_valid)
Karsten Hopp 5111b4
! 	{
Karsten Hopp 5111b4
! 	    if (lnum < win->w_lines[i].wl_lnum)
Karsten Hopp 5111b4
! 		return -1;
Karsten Hopp 5111b4
! 	    if (lnum <= win->w_lines[i].wl_lastlnum)
Karsten Hopp 5111b4
! 		return i;
Karsten Hopp 5111b4
! 	}
Karsten Hopp 5111b4
      return -1;
Karsten Hopp 5111b4
  }
Karsten Hopp 5111b4
  
Karsten Hopp 5111b4
*** ../vim-7.2.396/src/version.c	2010-03-17 14:47:56.000000000 +0100
Karsten Hopp 5111b4
--- src/version.c	2010-03-17 16:43:34.000000000 +0100
Karsten Hopp 5111b4
***************
Karsten Hopp 5111b4
*** 683,684 ****
Karsten Hopp 5111b4
--- 683,686 ----
Karsten Hopp 5111b4
  {   /* Add new patch number below this line */
Karsten Hopp 5111b4
+ /**/
Karsten Hopp 5111b4
+     397,
Karsten Hopp 5111b4
  /**/
Karsten Hopp 5111b4
Karsten Hopp 5111b4
-- 
Karsten Hopp 5111b4
Did you ever stop to think...  and forget to start again?
Karsten Hopp 5111b4
                                  -- Steven Wright
Karsten Hopp 5111b4
Karsten Hopp 5111b4
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 5111b4
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 5111b4
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 5111b4
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///