diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-05 20:10:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-05 20:10:33 +0100 |
| commit | 94255df057afa0b7dde77612f3274d4440871bd1 (patch) | |
| tree | e636366e80b3ff0a2ae52203b5c14a2c9401d2ab | |
| parent | eed3571fe0f7d2ae779e5d36388cc4fe16c3516e (diff) | |
| download | vim-git-94255df057afa0b7dde77612f3274d4440871bd1.tar.gz | |
patch 8.2.0211: test for ANSI colors fails without an "ls" commandv8.2.0211
Problem: Test for ANSI colors fails without an "ls" command.
Solution: Use "dir". (Ken Takata, closes #5582)
| -rw-r--r-- | src/testdir/test_functions.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 4f417fa93..9173e8547 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1965,7 +1965,7 @@ func Test_range() " settagstack() call settagstack(1, #{items : range(4)}) - + " sign_define() call assert_fails("call sign_define(range(5))", "E715:") call assert_fails("call sign_placelist(range(5))", "E715:") @@ -1997,12 +1997,17 @@ func Test_range() set tagfunc=TagFunc call assert_fails("call taglist('asdf')", 'E987:') set tagfunc= - + " term_start() if has('terminal') && has('termguicolors') call assert_fails('call term_start(range(3, 4))', 'E474:') let g:terminal_ansi_colors = range(16) - call assert_fails('call term_start("ls", #{term_finish: "close"})', 'E475:') + if has('win32') + let cmd = "cmd /c dir" + else + let cmd = "ls" + endif + call assert_fails('call term_start("' .. cmd .. '", #{term_finish: "close"})', 'E475:') unlet g:terminal_ansi_colors endif diff --git a/src/version.c b/src/version.c index 53262817d..a482b034a 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 211, +/**/ 210, /**/ 209, |