To: vim_dev@googlegroups.com Subject: Patch 8.1.2276 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2276 Problem: MS-Windows: session test leaves files behind. Solution: Wipe out buffers before deleting the directory. (closes #5187) Files: src/testdir/test_mksession.vim *** ../vim-8.1.2275/src/testdir/test_mksession.vim 2019-11-09 17:18:48.864265057 +0100 --- src/testdir/test_mksession.vim 2019-11-09 17:52:17.590863598 +0100 *************** *** 276,283 **** 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 call delete("Xtopdir", "rf") endfunc --- 276,283 ---- 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')) ! %bwipe ! call chdir(save_cwd) call delete("Xtopdir", "rf") endfunc *************** *** 623,628 **** --- 623,629 ---- " 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,639 **** call assert_equal('testdir', fnamemodify(getcwd(), ':t')) source Xproj/Xtest_mks2.out call assert_equal('Xproj', fnamemodify(getcwd(), ':t')) ! cd .. set sessionoptions& call delete('Xproj', 'rf') --- 634,641 ---- call assert_equal('testdir', fnamemodify(getcwd(), ':t')) source Xproj/Xtest_mks2.out call assert_equal('Xproj', fnamemodify(getcwd(), ':t')) ! call chdir(save_cwd) ! %bwipe set sessionoptions& call delete('Xproj', 'rf') *** ../vim-8.1.2275/src/version.c 2019-11-09 17:18:48.864265057 +0100 --- src/version.c 2019-11-09 17:53:07.198525663 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2276, /**/ -- hundred-and-one symptoms of being an internet addict: 49. You never have to deal with busy signals when calling your ISP...because you never log off. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///