diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-04 22:32:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-04 22:32:39 +0200 |
| commit | 981d9dc8f3d7a470eb3be7ba60fe1c1f31e7f470 (patch) | |
| tree | 8cc227b11121a293be323e137f20ceb6cf98a190 | |
| parent | b7ed839976120912c8a755fd1b0f67026b4b056f (diff) | |
patch 8.1.1634: terminal test fails when term_getansicolors() is missingv8.1.1634
Problem: Terminal test fails when term_getansicolors() is missing.
Diff test fails without +rightleft. (Dominique Pelle)
Solution: Check if term_getansicolors() is supported. (closes #4597)
| -rw-r--r-- | src/testdir/test_diffmode.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index e5a3f2fcf4..bf49740777 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -909,6 +909,9 @@ func Test_diff_of_diff() if !CanRunVimInTerminal() throw 'Skipped: cannot run Vim in a terminal window' endif + if !has("rightleft") + throw 'Skipped: rightleft not supported' + endif call writefile([ \ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])', diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index fa9eb1e996..6a9a6aa4ef 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1434,6 +1434,9 @@ func Test_terminal_api_call_fail_delete() endfunc func Test_terminal_ansicolors_default() + if !exists('*term_getansicolors') + throw 'Skipped: term_getansicolors() not supported' + endif let colors = [ \ '#000000', '#e00000', \ '#00e000', '#e0e000', @@ -1465,6 +1468,9 @@ let s:test_colors = [ \] func Test_terminal_ansicolors_global() + if !exists('*term_getansicolors') + throw 'Skipped: term_getansicolors() not supported' + endif let g:terminal_ansi_colors = reverse(copy(s:test_colors)) let buf = Run_shell_in_terminal({}) call assert_equal(g:terminal_ansi_colors, term_getansicolors(buf)) @@ -1476,6 +1482,9 @@ func Test_terminal_ansicolors_global() endfunc func Test_terminal_ansicolors_func() + if !exists('*term_getansicolors') + throw 'Skipped: term_getansicolors() not supported' + endif let g:terminal_ansi_colors = reverse(copy(s:test_colors)) let buf = Run_shell_in_terminal({'ansi_colors': s:test_colors}) call assert_equal(s:test_colors, term_getansicolors(buf)) diff --git a/src/version.c b/src/version.c index 20bff057c2..d1e12c8238 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1634, +/**/ 1633, /**/ 1632, |