Mercurial > vim
changeset 13537:3fa880445c99 v8.0.1642
patch 8.0.1642: running Vim in terminal fails with two windows
commit https://github.com/vim/vim/commit/15a1c3fdc19499c267e4dc664aa0de9d65a08cad
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 25 18:56:25 2018 +0200
patch 8.0.1642: running Vim in terminal fails with two windows
Problem: Running Vim in terminal fails with two windows.
Solution: Pass the number of rows to RunVimInTerminal().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 25 Mar 2018 19:00:07 +0200 |
| parents | 46d9df94be82 |
| children | 2bc543b10a51 |
| files | src/testdir/screendump.vim src/testdir/test_terminal.vim src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -47,11 +47,17 @@ func RunVimInTerminal(arguments, options set t_Co=256 background=light hi Normal ctermfg=NONE ctermbg=NONE + " Make the window 20 lines high, unless told otherwise. + let rows = 20 + if has_key(a:options, 'rows') + let rows = a:options['rows'] + endif + let cmd = GetVimCommandClean() " Add -v to have gvim run in the terminal (if possible) let cmd .= ' -v ' . a:arguments - let buf = term_start(cmd, {'curwin': 1, 'term_rows': 20, 'term_cols': 75}) - call assert_equal([20, 75], term_getsize(buf)) + let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': 75}) + call assert_equal([rows, 75], term_getsize(buf)) return buf endfunc
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1064,7 +1064,7 @@ func Test_terminal_api_drop_oldwin() \ 'redraw', \ "set t_ts=", \ ], 'Xscript') - let buf = RunVimInTerminal('-S Xscript', {}) + let buf = RunVimInTerminal('-S Xscript', {'rows': 10}) call WaitFor({-> expand('%:t') =='Xtextfile'}) call assert_equal(textfile_winid, win_getid())