diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-06 21:13:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-06 21:13:00 +0200 |
| commit | c98cdb3bc970f04f93b4c394b4ec94c2eb5546c3 (patch) | |
| tree | 435d8858e7ac86130bd6ca30117f72dbb3533322 /src | |
| parent | 63969ef07e99502744114717cb7d63bd4c6e7eae (diff) | |
| download | vim-git-c98cdb3bc970f04f93b4c394b4ec94c2eb5546c3.tar.gz | |
patch 8.2.1630: terminal test failsv8.2.1630
Problem: Terminal test fails.
Solution: Correct argument to term_start(). Correct error number.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_terminal.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_terminal2.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index fbb725cb8..207ef9afe 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -912,7 +912,7 @@ func Test_terminal_composing_unicode() endif enew - let buf = term_start(cmd, {'curwin': bufnr('')}) + let buf = term_start(cmd, {'curwin': 1}) let g:job = term_getjob(buf) call WaitFor({-> term_getline(buf, 1) !=# ''}, 1000) diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim index 64310f625..87d1e3565 100644 --- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -560,8 +560,8 @@ func Test_term_gettty() endif endif - call assert_fails('call term_gettty(buf, 2)', 'E475:') - call assert_fails('call term_gettty(buf, -1)', 'E475:') + call assert_fails('call term_gettty(buf, 2)', 'E1023:') + call assert_fails('call term_gettty(buf, -1)', 'E1023:') call assert_equal('', term_gettty(buf + 1)) diff --git a/src/version.c b/src/version.c index 4ba5e51e8..b07e2a8dc 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1630, +/**/ 1629, /**/ 1628, |