summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-04-26 14:09:42 +0000
committerBram Moolenaar <Bram@vim.org>2007-04-26 14:09:42 +0000
commit053b9fa9c2eea6b48fb7ef1dfffc7639b98458d7 (patch)
tree4c047a7fce234982f3d83ceca2570cae71605bd7
parent97006f1ce8671abb0e13f410f750270abaa199e8 (diff)
downloadvim-git-053b9fa9c2eea6b48fb7ef1dfffc7639b98458d7.tar.gz
updated for version 7.0-227v7.0.227
-rw-r--r--src/version.c2
-rw-r--r--src/window.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index f19fbbaaf..dc85d40a6 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 */
/**/
+ 227,
+/**/
226,
/**/
225,
diff --git a/src/window.c b/src/window.c
index 40aa2f062..28b9660b8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2084,6 +2084,13 @@ win_close(win, free_buf)
}
#endif
+#ifdef FEAT_GUI
+ /* Avoid trouble with scrollbars that are going to be deleted in
+ * win_free(). */
+ if (gui.in_use)
+ out_flush();
+#endif
+
/*
* Close the link to the buffer.
*/
@@ -4174,7 +4181,6 @@ win_free(wp, tp)
#ifdef FEAT_GUI
if (gui.in_use)
{
- out_flush();
gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_LEFT]);
gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_RIGHT]);
}