diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-07 16:33:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-07 16:33:18 +0200 |
| commit | 5db7eec42337f0eecdc332f582eecf37278044e8 (patch) | |
| tree | 84cf02384db29881a0a035e7858229294797163d | |
| parent | 02ab97709d5c56fb7fe42e134bb9fc54f76a1f9f (diff) | |
| download | vim-git-5db7eec42337f0eecdc332f582eecf37278044e8.tar.gz | |
patch 8.1.0243: using :term ++close ++hidden closes a windowv8.1.0243
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)
| -rw-r--r-- | src/terminal.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c index 427e027c5..66a73690f 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2818,11 +2818,17 @@ term_after_channel_closed(term_T *term) 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 912632470..b82dae13e 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1621,3 +1621,15 @@ func Test_terminal_hidden() 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 5a263a93e..46125c029 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 243, +/**/ 242, /**/ 241, |