From 1f02ab626c6d97242076ea17e22d4bbf61f5d0a2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 3 Feb 2010 18:14:49 +0100 Subject: 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) --- src/fold.c | 8 +++++++- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/fold.c b/src/fold.c index 405a6ef1..ff1139dc 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 91ae2ec9..b7aacc13 100644 --- a/src/version.c +++ b/src/version.c @@ -681,6 +681,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 356, /**/ 355, /**/ -- cgit v1.2.1