summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-28 13:38:54 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-28 13:38:54 +0200
commit1773ddfdcd106fa3bbf479c9b62ccde03c2a86ba (patch)
tree48a431312f3e7ec929ac95faf1404ac110e9cee7
parente67d546f3c691139e6d3d33f36724d98aec04c14 (diff)
patch 7.4.2276v7.4.2276
Problem: Command line test fails on Windows when run twice. Solution: Wipe the buffer so that the directory can be deleted.
-rw-r--r--src/testdir/test_cmdline.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index f6721d523a..4bacf5721d 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -186,5 +186,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/version.c b/src/version.c
index 152e7b74d6..60b137450c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2276,
+/**/
2275,
/**/
2274,