projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 907f7fb0 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.340 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.340 | |
| 11 | Problem: Gcc warning for condition that can never be true. (James Vega) | |
| 12 | Solution: Use start_lvl instead flp->lvl. | |
| 13 | Files: src/fold.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.339/src/fold.c 2009-11-03 18:04:26.000000000 +0100 | |
| 17 | --- src/fold.c 2010-01-19 16:45:13.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 3239,3246 **** | |
| 20 | flp->lvl = n; | |
| 21 | flp->lvl_next = n - 1; | |
| 22 | /* never start a fold with an end marker */ | |
| 23 | ! if (flp->lvl_next > flp->lvl) | |
| 24 | ! flp->lvl_next = flp->lvl; | |
| 25 | } | |
| 26 | } | |
| 27 | else | |
| 28 | --- 3239,3246 ---- | |
| 29 | flp->lvl = n; | |
| 30 | flp->lvl_next = n - 1; | |
| 31 | /* never start a fold with an end marker */ | |
| 32 | ! if (flp->lvl_next > start_lvl) | |
| 33 | ! flp->lvl_next = start_lvl; | |
| 34 | } | |
| 35 | } | |
| 36 | else | |
| 37 | *** ../vim-7.2.339/src/version.c 2010-01-19 16:31:10.000000000 +0100 | |
| 38 | --- src/version.c 2010-01-19 17:23:40.000000000 +0100 | |
| 39 | *************** | |
| 40 | *** 683,684 **** | |
| 41 | --- 683,686 ---- | |
| 42 | { /* Add new patch number below this line */ | |
| 43 | + /**/ | |
| 44 | + 340, | |
| 45 | /**/ | |
| 46 | ||
| 47 | -- | |
| 48 | Would you care for a drink? I mean, if it were, like, | |
| 49 | disabled and you had to look after it? | |
| 50 | ||
| 51 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 52 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 53 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 54 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |