summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-11-03 17:47:12 +0000
committerBram Moolenaar <Bram@vim.org>2009-11-03 17:47:12 +0000
commit3234cc6a3169b18e02a725157cb0f405cd72dd2a (patch)
tree5fcf830810ab91b328f75bde7eb21754f12332c7
parente161c791f649afe33c2bd02dda42c71685ff9996 (diff)
updated for version 7.2-284v7.2.284
-rw-r--r--src/misc1.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 23a1c1e4ba..bb15d429d6 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2886,6 +2886,13 @@ changed_common(lnum, col, lnume, xtra)
}
#endif
}
+
+#ifdef FEAT_FOLDING
+ /* Take care of side effects for setting w_topline when folds have
+ * changed. Esp. when the buffer was changed in another window. */
+ if (hasAnyFolding(wp))
+ set_topline(wp, wp->w_topline);
+#endif
}
}
diff --git a/src/version.c b/src/version.c
index 83af0958b3..8a71cbe39e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 284,
+/**/
283,
/**/
282,