diff options
author | Bram Moolenaar <bram@zimbu.org> | 2010-02-03 18:14:49 +0100 |
---|---|---|
committer | Bram Moolenaar <bram@zimbu.org> | 2010-02-03 18:14:49 +0100 |
commit | 1f02ab626c6d97242076ea17e22d4bbf61f5d0a2 (patch) | |
tree | 0748c0625b804874f484c59bf997852c62b39f93 | |
parent | 294967287315ff78ac84d53135403fbef956e1ad (diff) | |
download | vim-1f02ab626c6d97242076ea17e22d4bbf61f5d0a2.tar.gz |
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
@@ -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 91ae2ec9..b7aacc13 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, |