diff options
| author | prollings <patrickrollings@gmail.com> | 2016-07-03 10:22:59 +1000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-02 20:22:59 -0400 |
| commit | f80eb768c75de2065626203de001738e1dda436e (patch) | |
| tree | 1c0933ce1873ee21fe1741775ea71fb581355191 | |
| parent | c6eff87a25020032d089a0e40ae1a809d1b72bac (diff) | |
| download | rneovim-f80eb768c75de2065626203de001738e1dda436e.tar.gz rneovim-f80eb768c75de2065626203de001738e1dda436e.tar.bz2 rneovim-f80eb768c75de2065626203de001738e1dda436e.zip | |
vim-patch:7.4.1121 (#4989)
Problem: test_expand leaves files behind.
Solution: Edit another file before deleting, otherwise the swap file
remains.
https://github.com/vim/vim/commit/08b270a8a4544be9a7fecce311834fde2b457634
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/expand_spec.lua | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index aa3a34b3df..36f2b51ac2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -574,7 +574,7 @@ static int included_patches[] = { // 1124 NA 1123, // 1122 NA - // 1121, + 1121, 1120, 1119, 1118, diff --git a/test/functional/legacy/expand_spec.lua b/test/functional/legacy/expand_spec.lua index 5a2d46706a..d1df40556f 100644 --- a/test/functional/legacy/expand_spec.lua +++ b/test/functional/legacy/expand_spec.lua @@ -41,10 +41,13 @@ describe('expand file name', function() call assert_equal('Xdir3/Xdir4/file', expand('%')) next! Xdir?/*/nofile call assert_equal('Xdir?/*/nofile', expand('%')) + " Edit another file, on MS-Windows the swap file would be in use and can't + " be deleted + edit foo - call delete('Xdir1', 'rf') - call delete('Xdir2', 'rf') - call delete('Xdir3', 'rf') + call assert_equal(0, delete('Xdir1', 'rf')) + call assert_equal(0, delete('Xdir2', 'rf')) + call assert_equal(0, delete('Xdir3', 'rf')) endfunc func Test_with_tilde() |