summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-17 22:40:41 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-17 22:40:41 +0200
commit517f71ab17c265602465eaee3775dcfe8afe0478 (patch)
tree669ec9e567c9f98e6a143a59e63e6a301673a198
parent9b283523f2f75b45feef902b8713808e883d9c19 (diff)
patch 8.1.1566: error message when terminal closes in another tabv8.1.1566
Problem: Error message when terminal closes while it is not in the current tab. Solution: Also set "do_set_w_closing" when using the special autocommand window. (closes #4552)
-rw-r--r--src/terminal.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 1764b052d8..21026e2f74 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3019,6 +3019,8 @@ term_after_channel_closed(term_T *term)
ch_log(NULL, "terminal job finished, closing window");
aucmd_prepbuf(&aco, term->tl_buffer);
// Avoid closing the window if we temporarily use it.
+ if (curwin == aucmd_win)
+ do_set_w_closing = TRUE;
if (do_set_w_closing)
curwin->w_closing = TRUE;
do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE);
diff --git a/src/version.c b/src/version.c
index ee07b96195..86ccdf46e8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1566,
+/**/
1565,
/**/
1564,