updated for version 7.0-240
diff --git a/src/version.c b/src/version.c
index 358d4b5..66893a2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 240,
+/**/
239,
/**/
238,
diff --git a/src/window.c b/src/window.c
index 28b9660..0ee1ad4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -722,6 +722,12 @@
need_status = STATUS_HEIGHT;
}
+#ifdef FEAT_GUI
+ /* May be needed for the scrollbars that are going to change. */
+ if (gui.in_use)
+ out_flush();
+#endif
+
#ifdef FEAT_VERTSPLIT
if (flags & WSP_VERT)
{
@@ -4071,6 +4077,12 @@
if (newwin != NULL)
{
+#ifdef FEAT_AUTOCMD
+ /* Don't execute autocommands while the window is not properly
+ * initialized yet. gui_create_scrollbar() may trigger a FocusGained
+ * event. */
+ ++autocmd_block;
+#endif
/*
* link the window in the window list
*/
@@ -4100,7 +4112,6 @@
#ifdef FEAT_GUI
if (gui.in_use)
{
- out_flush();
gui_create_scrollbar(&newwin->w_scrollbars[SBAR_LEFT],
SBAR_LEFT, newwin);
gui_create_scrollbar(&newwin->w_scrollbars[SBAR_RIGHT],
@@ -4114,6 +4125,9 @@
#ifdef FEAT_FOLDING
foldInitWin(newwin);
#endif
+#ifdef FEAT_AUTOCMD
+ --autocmd_block;
+#endif
}
return newwin;
}
@@ -4130,6 +4144,12 @@
{
int i;
+#ifdef FEAT_AUTOCMD
+ /* Don't execute autocommands while the window is halfway being deleted.
+ * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
+ ++autocmd_block;
+#endif
+
#ifdef FEAT_MZSCHEME
mzscheme_window_free(wp);
#endif
@@ -4188,6 +4208,10 @@
win_remove(wp, tp);
vim_free(wp);
+
+#ifdef FEAT_AUTOCMD
+ --autocmd_block;
+#endif
}
/*
