diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-09 18:06:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-09 18:06:04 +0100 |
| commit | 5bf46e978619ff602a7c63dd98e19de8248236b3 (patch) | |
| tree | d2289eb60b0c3bd04c91a06e626e8f606ef7453d | |
| parent | 1e15e61188e14ba67060c09d4c74e9b587016230 (diff) | |
| download | vim-git-5bf46e978619ff602a7c63dd98e19de8248236b3.tar.gz | |
patch 8.1.2276: MS-Windows: session test leaves files behindv8.1.2276
Problem: MS-Windows: session test leaves files behind.
Solution: Wipe out buffers before deleting the directory. (closes #5187)
| -rw-r--r-- | src/testdir/test_mksession.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim index d713da73e..a3712a37d 100644 --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -276,8 +276,8 @@ func Test_mksession_tcd_multiple_tabs() call assert_equal('Xtabdir3', fnamemodify(getcwd(-1, 3), ':t')) call assert_equal('Xtabdir3', fnamemodify(getcwd(1, 3), ':t')) call assert_equal('Xwindir3', fnamemodify(getcwd(2, 3), ':t')) - only | tabonly - exe 'cd ' . save_cwd + %bwipe + call chdir(save_cwd) call delete("Xtopdir", "rf") endfunc @@ -623,6 +623,7 @@ endfunc " Test for changing directory to the session file directory func Test_mksession_sesdir() + let save_cwd = getcwd() call mkdir('Xproj') mksession! Xproj/Xtest_mks1.out set sessionoptions-=curdir @@ -633,7 +634,8 @@ func Test_mksession_sesdir() call assert_equal('testdir', fnamemodify(getcwd(), ':t')) source Xproj/Xtest_mks2.out call assert_equal('Xproj', fnamemodify(getcwd(), ':t')) - cd .. + call chdir(save_cwd) + %bwipe set sessionoptions& call delete('Xproj', 'rf') diff --git a/src/version.c b/src/version.c index 44149ff0a..fc6808b9c 100644 --- 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 */ /**/ + 2276, +/**/ 2275, /**/ 2274, |