patch 8.1.0243: using :term ++close ++hidden closes a window
Problem: Using :term ++close ++hidden closes a window. (Marcin Szamotulski)
Solution: Don't close the window if only using it temporarily for unloading
the terminal buffer. (closes #3287)
diff --git a/src/terminal.c b/src/terminal.c
index 427e027..66a7369 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2818,11 +2818,17 @@
if (term->tl_finish == TL_FINISH_CLOSE)
{
aco_save_T aco;
+ int do_set_w_closing = term->tl_buffer->b_nwindows == 0;
- /* ++close or term_finish == "close" */
+ // ++close or term_finish == "close"
ch_log(NULL, "terminal job finished, closing window");
aucmd_prepbuf(&aco, term->tl_buffer);
+ // Avoid closing the window if we temporarily use it.
+ if (do_set_w_closing)
+ curwin->w_closing = TRUE;
do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE);
+ if (do_set_w_closing)
+ curwin->w_closing = FALSE;
aucmd_restbuf(&aco);
return TRUE;
}
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 9126324..b82dae1 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1621,3 +1621,15 @@
call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))})
bwipe!
endfunc
+
+func Test_terminal_hidden_and_close()
+ if !has('unix')
+ return
+ endif
+ call assert_equal(1, winnr('$'))
+ term ++hidden ++close ls
+ let bnr = bufnr('$')
+ call assert_equal('terminal', getbufvar(bnr, '&buftype'))
+ call WaitForAssert({-> assert_false(bufexists(bnr))})
+ call assert_equal(1, winnr('$'))
+endfunc
diff --git a/src/version.c b/src/version.c
index 5a263a9..46125c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 243,
+/**/
242,
/**/
241,