patch 7.4.1121
Problem: test_expand leaves files behind.
Solution: Edit another file before deleting, otherwise the swap file
remains.
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
index a68c422..c099eda 100644
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -20,10 +20,13 @@
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
- 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()
diff --git a/src/version.c b/src/version.c
index ef98ee4..06044d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1121,
+/**/
1120,
/**/
1119,