summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-27 14:29:24 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-27 14:29:24 +0100
commite3d065454408a103c39308651dd7793f0bf55ba6 (patch)
tree356bc941c9382cd740d8e60d1ee28f2335f6c108
parentd39e275b57493f9e25e1b62f84810571eee30cf4 (diff)
downloadvim-git-e3d065454408a103c39308651dd7793f0bf55ba6.tar.gz
patch 8.1.0830: test leaves directory behind on MS-Windowsv8.1.0830
Problem: Test leaves directory behind on MS-Windows. Solution: Close buffer before deleting directory.
-rw-r--r--src/testdir/test_swap.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 208d4d966..ce5257891 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -98,6 +98,9 @@ func Test_missing_dir()
split bar/x.txt
only
+ " Delete the buffer so that swap file is removed before we try to delete the
+ " directory. That fails on MS-Windows.
+ %bdelete!
set directory&
call delete('Xswapdir', 'rf')
endfunc
diff --git a/src/version.c b/src/version.c
index af289037c..989179632 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 830,
+/**/
829,
/**/
828,