summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-10-14 13:33:20 +0000
committerBram Moolenaar <Bram@vim.org>2007-10-14 13:33:20 +0000
commitfa6d5afd8459cfcbed2d91e0280d6f7fb9fcdb18 (patch)
tree8c63849f7c361033d3708d9004c50a2315be78fe
parentaa8494a13eb1f8b5eb4a417bb03e7bb5ea399c57 (diff)
updated for version 7.1-139v7.1.139
-rw-r--r--src/fold.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/fold.c b/src/fold.c
index 07b0748634..5e67dd2e6d 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -858,7 +858,14 @@ foldUpdate(wp, top, bot)
|| foldmethodIsDiff(wp)
#endif
|| foldmethodIsSyntax(wp))
+ {
+ int save_got_int = got_int;
+
+ /* reset got_int here, otherwise it won't work */
+ got_int = FALSE;
foldUpdateIEMS(wp, top, bot);
+ got_int |= save_got_int;
+ }
}
/* foldUpdateAll() {{{2 */
diff --git a/src/version.c b/src/version.c
index ce42fbc4ab..67a1eef5b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 139,
+/**/
138,
/**/
137,