vim-patch:7.4.1121 (#4989)

Problem:    test_expand leaves files behind.
Solution:   Edit another file before deleting, otherwise the swap file
            remains.

08b270a8a4
This commit is contained in:
prollings 2016-07-03 10:22:59 +10:00 committed by Justin M. Keyes
parent c6eff87a25
commit f80eb768c7
2 changed files with 7 additions and 4 deletions

View File

@ -574,7 +574,7 @@ static int included_patches[] = {
// 1124 NA // 1124 NA
1123, 1123,
// 1122 NA // 1122 NA
// 1121, 1121,
1120, 1120,
1119, 1119,
1118, 1118,

View File

@ -41,10 +41,13 @@ describe('expand file name', function()
call assert_equal('Xdir3/Xdir4/file', expand('%')) call assert_equal('Xdir3/Xdir4/file', expand('%'))
next! Xdir?/*/nofile next! Xdir?/*/nofile
call assert_equal('Xdir?/*/nofile', expand('%')) call assert_equal('Xdir?/*/nofile', expand('%'))
" 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 assert_equal(0, delete('Xdir1', 'rf'))
call delete('Xdir2', 'rf') call assert_equal(0, delete('Xdir2', 'rf'))
call delete('Xdir3', 'rf') call assert_equal(0, delete('Xdir3', 'rf'))
endfunc endfunc
func Test_with_tilde() func Test_with_tilde()