# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1453052704 -3600
# Node ID 2b2e90fcd72b1d4f999e3b9dbd9d85ea7f2fbfc6
# Parent  a011a3e63dd33c625c6a6e2740cb840ef3b0a5a1
commit https://github.com/vim/vim/commit/08b270a8a4544be9a7fecce311834fde2b457634
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jan 17 18:34:19 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1121,
+/**/
     1120,
 /**/
     1119,