Karsten Hopp 3e6c1d
To: vim-dev@vim.org
Karsten Hopp 3e6c1d
Subject: Patch 7.2.340
Karsten Hopp 3e6c1d
Fcc: outbox
Karsten Hopp 3e6c1d
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 3e6c1d
Mime-Version: 1.0
Karsten Hopp 3e6c1d
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 3e6c1d
Content-Transfer-Encoding: 8bit
Karsten Hopp 3e6c1d
------------
Karsten Hopp 3e6c1d
Karsten Hopp 3e6c1d
Patch 7.2.340
Karsten Hopp 3e6c1d
Problem:    Gcc warning for condition that can never be true. (James Vega)
Karsten Hopp 3e6c1d
Solution:   Use start_lvl instead flp->lvl.
Karsten Hopp 3e6c1d
Files:	    src/fold.c
Karsten Hopp 3e6c1d
Karsten Hopp 3e6c1d
Karsten Hopp 3e6c1d
*** ../vim-7.2.339/src/fold.c	2009-11-03 18:04:26.000000000 +0100
Karsten Hopp 3e6c1d
--- src/fold.c	2010-01-19 16:45:13.000000000 +0100
Karsten Hopp 3e6c1d
***************
Karsten Hopp 3e6c1d
*** 3239,3246 ****
Karsten Hopp 3e6c1d
  		    flp->lvl = n;
Karsten Hopp 3e6c1d
  		    flp->lvl_next = n - 1;
Karsten Hopp 3e6c1d
  		    /* never start a fold with an end marker */
Karsten Hopp 3e6c1d
! 		    if (flp->lvl_next > flp->lvl)
Karsten Hopp 3e6c1d
! 			flp->lvl_next = flp->lvl;
Karsten Hopp 3e6c1d
  		}
Karsten Hopp 3e6c1d
  	    }
Karsten Hopp 3e6c1d
  	    else
Karsten Hopp 3e6c1d
--- 3239,3246 ----
Karsten Hopp 3e6c1d
  		    flp->lvl = n;
Karsten Hopp 3e6c1d
  		    flp->lvl_next = n - 1;
Karsten Hopp 3e6c1d
  		    /* never start a fold with an end marker */
Karsten Hopp 3e6c1d
! 		    if (flp->lvl_next > start_lvl)
Karsten Hopp 3e6c1d
! 			flp->lvl_next = start_lvl;
Karsten Hopp 3e6c1d
  		}
Karsten Hopp 3e6c1d
  	    }
Karsten Hopp 3e6c1d
  	    else
Karsten Hopp 3e6c1d
*** ../vim-7.2.339/src/version.c	2010-01-19 16:31:10.000000000 +0100
Karsten Hopp 3e6c1d
--- src/version.c	2010-01-19 17:23:40.000000000 +0100
Karsten Hopp 3e6c1d
***************
Karsten Hopp 3e6c1d
*** 683,684 ****
Karsten Hopp 3e6c1d
--- 683,686 ----
Karsten Hopp 3e6c1d
  {   /* Add new patch number below this line */
Karsten Hopp 3e6c1d
+ /**/
Karsten Hopp 3e6c1d
+     340,
Karsten Hopp 3e6c1d
  /**/
Karsten Hopp 3e6c1d
Karsten Hopp 3e6c1d
-- 
Karsten Hopp 3e6c1d
Would you care for a drink?   I mean, if it were, like,
Karsten Hopp 3e6c1d
disabled and you had to look after it?
Karsten Hopp 3e6c1d
Karsten Hopp 3e6c1d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 3e6c1d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 3e6c1d
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 3e6c1d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///