projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.154 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.154 | |
| 11 | Problem: When 'foldnextmax' is negative Vim can hang. (James Vega) | |
| 12 | Solution: Avoid the fold level becoming negative. | |
| 13 | Files: src/fold.c, src/syntax.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.0.153/src/fold.c Sun Apr 23 00:31:04 2006 | |
| 17 | --- src/fold.c Sun Oct 29 20:23:21 2006 | |
| 18 | *************** | |
| 19 | *** 2971,2977 **** | |
| 20 | --- 2971,2981 ---- | |
| 21 | else | |
| 22 | flp->lvl = get_indent_buf(buf, lnum) / buf->b_p_sw; | |
| 23 | if (flp->lvl > flp->wp->w_p_fdn) | |
| 24 | + { | |
| 25 | flp->lvl = flp->wp->w_p_fdn; | |
| 26 | + if (flp->lvl < 0) | |
| 27 | + flp->lvl = 0; | |
| 28 | + } | |
| 29 | } | |
| 30 | ||
| 31 | /* foldlevelDiff() {{{2 */ | |
| 32 | *** ../vim-7.0.153/src/syntax.c Tue Oct 3 17:04:21 2006 | |
| 33 | --- src/syntax.c Sun Oct 29 20:21:27 2006 | |
| 34 | *************** | |
| 35 | *** 6072,6078 **** | |
| 36 | --- 6072,6082 ---- | |
| 37 | ++level; | |
| 38 | } | |
| 39 | if (level > wp->w_p_fdn) | |
| 40 | + { | |
| 41 | level = wp->w_p_fdn; | |
| 42 | + if (level < 0) | |
| 43 | + level = 0; | |
| 44 | + } | |
| 45 | return level; | |
| 46 | } | |
| 47 | #endif | |
| 48 | *** ../vim-7.0.153/src/version.c Mon Oct 30 22:31:30 2006 | |
| 49 | --- src/version.c Wed Nov 1 12:41:14 2006 | |
| 50 | *************** | |
| 51 | *** 668,669 **** | |
| 52 | --- 668,671 ---- | |
| 53 | { /* Add new patch number below this line */ | |
| 54 | + /**/ | |
| 55 | + 154, | |
| 56 | /**/ | |
| 57 | ||
| 58 | -- | |
| 59 | hundred-and-one symptoms of being an internet addict: | |
| 60 | 134. You consider bandwidth to be more important than carats. | |
| 61 | ||
| 62 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 63 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 64 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 65 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |