diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-04-07 03:43:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 03:43:36 +0200 |
| commit | 805b5f2e1ec074648e2142c1eaab1d2c089aa58d (patch) | |
| tree | 64a3405bbc6c28580507d4de4a281932f719f7e5 /src/nvim/testdir | |
| parent | cf072cf223287d37c1c59926ff4600d249e1522c (diff) | |
| parent | 4d6e99c94913676cc7a6581c13579e5f9fbe26c5 (diff) | |
| download | rneovim-805b5f2e1ec074648e2142c1eaab1d2c089aa58d.tar.gz rneovim-805b5f2e1ec074648e2142c1eaab1d2c089aa58d.tar.bz2 rneovim-805b5f2e1ec074648e2142c1eaab1d2c089aa58d.zip | |
Merge #9840 from janlazo/vim-8.0.0709
vim-patch:8.0.{709,728},8.1.{135,308}
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/test_cd.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mksession.vim | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/testdir/test_cd.vim b/src/nvim/testdir/test_cd.vim index 770ed55b8d..4436ebbf31 100644 --- a/src/nvim/testdir/test_cd.vim +++ b/src/nvim/testdir/test_cd.vim @@ -24,7 +24,10 @@ func Test_cd_no_arg() call assert_equal(path, getcwd()) else " Test that cd without argument echoes cwd on non-Unix systems. + let shellslash = &shellslash + set shellslash call assert_match(getcwd(), execute('cd')) + let &shellslash = shellslash endif endfunc diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim index c2e7bb7bf9..c790bd32e3 100644 --- a/src/nvim/testdir/test_mksession.vim +++ b/src/nvim/testdir/test_mksession.vim @@ -17,9 +17,9 @@ func Test_mksession() \ ' four leadinG spaces', \ 'two consecutive tabs', \ 'two tabs in one line', - \ 'one ä multibyteCharacter', - \ 'aä Ä two multiByte characters', - \ 'Aäöü three mulTibyte characters', + \ 'one ä multibyteCharacter', + \ 'aä Ä two multiByte characters', + \ 'Aäöü three mulTibyte characters', \ 'short line', \ ]) let tmpfile = 'Xtemp' @@ -240,13 +240,14 @@ endfunc func Test_mksession_quote_in_filename() let v:errmsg = '' + let filename = has('win32') ? 'x''y' : 'x''y"z' %bwipe! split another - split x'y\"z + execute 'split' escape(filename, '"') mksession! Xtest_mks_quoted.out %bwipe! source Xtest_mks_quoted.out - call assert_true(bufexists("x'y\"z")) + call assert_true(bufexists(filename)) %bwipe! call delete('Xtest_mks_quoted.out') |