diff options
| author | prollings <patrickrollings@gmail.com> | 2016-07-06 23:13:48 +1000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-06 09:13:48 -0400 |
| commit | 6cee9d1a17177f4ccdf34283c6ed3ffaa98b32cc (patch) | |
| tree | 027a6915dbfce9a197a956be7bd7d793615b425d | |
| parent | 8641e3a1567aa86f73ad3f357ad114b7a393abce (diff) | |
| download | rneovim-6cee9d1a17177f4ccdf34283c6ed3ffaa98b32cc.tar.gz rneovim-6cee9d1a17177f4ccdf34283c6ed3ffaa98b32cc.tar.bz2 rneovim-6cee9d1a17177f4ccdf34283c6ed3ffaa98b32cc.zip | |
vim-patch:7.4.1111 (#5004)
Problem: test_expand fails on MS-Windows.
Solution: Always use forward slashes. Remove references to test27.
https://github.com/vim/vim/commit/f60b796fa9870bdfc4cdeb91653bac041916077d
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/expand_spec.lua | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 578d64efde..1b1f5d7688 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -39,6 +39,9 @@ set nomore " Output all messages in English. lang mess C +" Always use forward slashes. +set shellslash + " Source the test script. First grab the file name, in case the script " navigates away. let testname = expand('%') diff --git a/src/nvim/version.c b/src/nvim/version.c index 36f2b51ac2..278255c904 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -584,7 +584,7 @@ static int included_patches[] = { 1114, 1113, 1112, - // 1111, + 1111, 1110, // 1109 NA 1108, diff --git a/test/functional/legacy/expand_spec.lua b/test/functional/legacy/expand_spec.lua index d1df40556f..7bf6fb67dc 100644 --- a/test/functional/legacy/expand_spec.lua +++ b/test/functional/legacy/expand_spec.lua @@ -39,8 +39,10 @@ describe('expand file name', function() next Xdir?/*/file call assert_equal('Xdir3/Xdir4/file', expand('%')) - next! Xdir?/*/nofile - call assert_equal('Xdir?/*/nofile', expand('%')) + if has('unix') + next! Xdir?/*/nofile + call assert_equal('Xdir?/*/nofile', expand('%')) + endif " Edit another file, on MS-Windows the swap file would be in use and can't " be deleted edit foo |