diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-09-18 13:17:09 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-09-18 13:17:09 +0000 |
commit | 194b94c5a8c64e8e4d1ae180a59b1ed93010c196 (patch) | |
tree | fc3bbabe2e6ca4b505be7b7295c20aed375ff671 /src | |
parent | 2db24dc29b12eabd4aa4a1d3258298cf2d689a86 (diff) |
updated for version 7.2-261v7.2.261
Diffstat (limited to 'src')
-rw-r--r-- | src/fold.c | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/fold.c b/src/fold.c index 6567906be7..a127bf67cc 100644 --- a/src/fold.c +++ b/src/fold.c @@ -1607,11 +1607,11 @@ foldMarkAdjustRecurse(gap, line1, line2, amount, amount_after) } else { - /* 2, 3, or 5: need to correct nested folds too */ - foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, - line2 - fp->fd_top, amount, amount_after); if (fp->fd_top < top) { + /* 2 or 3: need to correct nested folds too */ + foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, + line2 - fp->fd_top, amount, amount_after); if (last <= line2) { /* 2. fold contains line1, line2 is below fold */ @@ -1628,7 +1628,11 @@ foldMarkAdjustRecurse(gap, line1, line2, amount, amount_after) } else { - /* 5. fold is below line1 and contains line2 */ + /* 5. fold is below line1 and contains line2; need to + * correct nested folds too */ + foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, + line2 - fp->fd_top, amount, + amount_after + (fp->fd_top - top)); if (amount == MAXLNUM) { fp->fd_len -= line2 - fp->fd_top + 1; diff --git a/src/version.c b/src/version.c index ac86367b3a..9ccfc525cc 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 261, +/**/ 260, /**/ 259, |