# HG changeset patch # User Bram Moolenaar # Date 1265217289 -3600 # Node ID 8a0a8f10b43e02d44ff26d608cd80fb61ce4773d # Parent 4483ee552619492639c69f4345d6554b7bcbef2b updated for version 7.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) diff --git a/src/fold.c b/src/fold.c --- 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 --- 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,