diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-29 22:48:50 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-29 16:48:50 +0200 |
| commit | 2846d508b24eb9f8ab59d21a060fd8130906392f (patch) | |
| tree | 9b57f772a4c0f2c92a1c8bafa6b78a44b0fdabe4 | |
| parent | 18e7d552008b92dd3ecd42bf6855530838fd22ab (diff) | |
| download | rneovim-2846d508b24eb9f8ab59d21a060fd8130906392f.tar.gz rneovim-2846d508b24eb9f8ab59d21a060fd8130906392f.tar.bz2 rneovim-2846d508b24eb9f8ab59d21a060fd8130906392f.zip | |
vim-patch:7.4.2276 (#6393)
* vim-patch:7.4.2276
Problem: Command line test fails on Windows when run twice.
Solution: Wipe the buffer so that the directory can be deleted.
https://github.com/vim/vim/commit/1773ddfdcd106fa3bbf479c9b62ccde03c2a86ba
* version.c: mark vim-patch 7.4.2269 as included (#5659)
| -rw-r--r-- | src/nvim/testdir/test_cmdline.vim | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index f56227250c..0c9d1297d6 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -201,5 +201,6 @@ func Test_expand_star_star() call writefile(['asdfasdf'], 'a/b/fileXname') call feedkeys(":find **/fileXname\<Tab>\<CR>", 'xt') call assert_equal('find a/b/fileXname', getreg(':')) + bwipe! call delete('a', 'rf') endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index dd583f6ffd..020737ac8c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -165,14 +165,14 @@ static int included_patches[] = { 2279, // 2278 NA 2277, - // 2276, + 2276, 2275, 2274, 2273, 2272, // 2271 NA // 2270 NA - // 2269, + 2269, // 2268, // 2267 NA 2266, |