summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/autocmd.c13
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 4 deletions
diff --git a/src/autocmd.c b/src/autocmd.c
index 305679cf3..789dde1a2 100644
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -1613,10 +1613,15 @@ win_found:
#endif
}
#if defined(FEAT_GUI)
- // Hide the scrollbars from the aucmd_win and update.
- gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
- gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
- gui_may_update_scrollbars();
+ if (gui.in_use)
+ {
+ // Hide the scrollbars from the aucmd_win and update.
+ gui_mch_enable_scrollbar(
+ &aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
+ gui_mch_enable_scrollbar(
+ &aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
+ gui_may_update_scrollbars();
+ }
#endif
}
else
diff --git a/src/version.c b/src/version.c
index 22f97ea21..aafa3d81d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3837,
+/**/
3836,
/**/
3835,