From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Feb 2010 17:14:49 +0000 (+0100)
Subject: updated for version 7.2.356
X-Git-Tag: v7.2.356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cee6a352b23c8e444d4e0f4a219c288da1b19f76;p=vim

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
index 405a6ef1d..ff1139dcb 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 91ae2ec9b..b7aacc130 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,
 /**/