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