diff options
author | Bram Moolenaar <Bram@vim.org> | 2010-02-03 18:14:49 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2010-02-03 18:14:49 +0100 |
commit | cee6a352b23c8e444d4e0f4a219c288da1b19f76 (patch) | |
tree | 1a858ccb15df37f17d79b1323579e755ef8d42e1 | |
parent | 6427c608e7faac67417be39ce9a6ce752d17a71a (diff) |
updated for version 7.2.356v7.2.356
Problem: When 'foldmethod' is changed not all folds are closed as expected.
Solution: In foldUpdate() correct the start position and reset fd_flags when
w_foldinvalid is set. (Lech Lorens)
-rw-r--r-- | src/fold.c | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/fold.c b/src/fold.c index 405a6ef1d6..ff1139dcb3 100644 --- a/src/fold.c +++ b/src/fold.c @@ -849,11 +849,17 @@ foldUpdate(wp, top, bot) fold_T *fp; /* Mark all folds from top to bot as maybe-small. */ - (void)foldFind(&curwin->w_folds, curwin->w_cursor.lnum, &fp); + (void)foldFind(&curwin->w_folds, top, &fp); while (fp < (fold_T *)curwin->w_folds.ga_data + curwin->w_folds.ga_len && fp->fd_top < bot) { fp->fd_small = MAYBE; + + /* Not sure if this is the right place to reset fd_flags (suggested by + * Lech Lorens). */ + if (wp->w_foldinvalid) + fp->fd_flags = FD_LEVEL; + ++fp; } diff --git a/src/version.c b/src/version.c index 91ae2ec9be..b7aacc130a 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 356, +/**/ 355, /**/ 354, |