thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1598: starting a hidden terminal resizes the current window

Browse Source 
Problem:    Starting a hidden terminal resizes the current window.
Solution:   Do not resize the current window for a hidden terminal.
            (closes #6872)
This commit is contained in:
Bram Moolenaar
2020-09-05 16:08:49 +02:00
parent 8b5866ded6
commit 2ce14589f2
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/terminal.c
View File

@@ -315,18 +315,22 @@ set_term_and_win_size(term_T *term, jobopt_T *opt)
else if (cols != 0)
term->tl_cols = cols;
if (term->tl_rows != curwin->w_height)
win_setheight_win(term->tl_rows, curwin);
if (term->tl_cols != curwin->w_width)
win_setwidth_win(term->tl_cols, curwin);
// Set 'winsize' now to avoid a resize at the next redraw.
if (!minsize && *curwin->w_p_tws != NUL)
if (!opt->jo_hidden)
{
char_u buf[100];
if (term->tl_rows != curwin->w_height)
win_setheight_win(term->tl_rows, curwin);
if (term->tl_cols != curwin->w_width)
win_setwidth_win(term->tl_cols, curwin);
vim_snprintf((char *)buf, 100, "%dx%d", term->tl_rows, term->tl_cols);
set_option_value((char_u *)"termwinsize", 0L, buf, OPT_LOCAL);
// Set 'winsize' now to avoid a resize at the next redraw.
if (!minsize && *curwin->w_p_tws != NUL)
{
char_u buf[100];
vim_snprintf((char *)buf, 100, "%dx%d",
term->tl_rows, term->tl_cols);
set_option_value((char_u *)"termwinsize", 0L, buf, OPT_LOCAL);
}
}
}

10
src/testdir/test_terminal2.vim
View File

@@ -130,6 +130,16 @@ func Test_terminal_termwinsize_overruled()
set termwinsize=
endfunc
" hidden terminal must not change current window size
func Test_terminal_hidden_winsize()
let cmd = GetDummyCmd()
let rows = winheight(0)
let buf = term_start(cmd, #{hidden: 1, term_rows: 10})
call assert_equal(rows, winheight(0))
call assert_equal([10, &columns], term_getsize(buf))
exe "bwipe! " .. buf
endfunc
func Test_terminal_termwinkey()
" make three tabpages, terminal in the middle
0tabnew

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1598,
/**/
1597,
/**/