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 a68c4226f0b9704c4a8a65b842ad718a5ed16829..c099edae1cc4f58990143c3984f96ab1d8654914 100644 (file)
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -20,10 +20,13 @@ func Test_with_directories()
     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 ef98ee4b8ad4fcb6c732c2fcbede40ffbfea0798..06044d4701706ccaae18b44986741e36596776bb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1121,
 /**/
     1120,
 /**/