patch 8.1.1566: error message when terminal closes in another tab

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)

diff --git a/src/terminal.c b/src/terminal.c
index 1764b052d89beb255003968f2cdaffab88d18957..21026e2f744d766dd3824db929aa07bb998dc009 100644 (file)
--- 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 ee07b9619518495f32c81247f8da8c2ac12716b6..86ccdf46e87d3d2a659419d374b60bf404dbe9af 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1566,
 /**/
     1565,
 /**/