diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-25 18:56:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-25 18:56:25 +0200 |
| commit | 15a1c3fdc19499c267e4dc664aa0de9d65a08cad (patch) | |
| tree | 2f254bb85d7844b5ecc08344751fc5649e2e8943 | |
| parent | 8fbaeb195d9298c3a2a80300b5f96f1adddd2f59 (diff) | |
patch 8.0.1642: running Vim in terminal fails with two windowsv8.0.1642
Problem: Running Vim in terminal fails with two windows.
Solution: Pass the number of rows to RunVimInTerminal().
| -rw-r--r-- | src/testdir/screendump.vim | 10 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index 093b483f10..60c0ccb012 100644 --- 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 diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index a7e5f61683..6f655185f3 100644 --- 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()) diff --git a/src/version.c b/src/version.c index 3295eb0892..c648d52c3f 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1642, +/**/ 1641, /**/ 1640, |