diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-29 14:14:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-29 14:14:09 +0100 |
| commit | c9b56b2ceb4662f87c39ea07ba5090a073fd6286 (patch) | |
| tree | 050b3d593e9c7a9326921413c4e583a4a36b48c2 | |
| parent | e0b66da69123815076b38c0c074a1c6aca5dfd27 (diff) | |
| download | vim-git-c9b56b2ceb4662f87c39ea07ba5090a073fd6286.tar.gz | |
patch 8.0.0258: mksession test leaves file behindv8.0.0258
Problem: mksession test leaves file behind.
Solution: Delete the file. Rename files to start with "X".
| -rw-r--r-- | src/testdir/test_mksession.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim index 77025c854..a51180cf0 100644 --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -22,7 +22,7 @@ func Test_mksession() \ 'aä Ä two multiByte characters', \ 'Aäöü three mulTibyte characters' \ ]) - let tmpfile = tempname() + let tmpfile = 'Xtemp' exec 'w! ' . tmpfile /^start: set wrap @@ -63,8 +63,8 @@ func Test_mksession() norm! j016|3zl split call wincol() - mksession! test_mks.out - let li = filter(readfile('test_mks.out'), 'v:val =~# "\\(^ *normal! 0\\|^ *exe ''normal!\\)"') + mksession! Xtest_mks.out + let li = filter(readfile('Xtest_mks.out'), 'v:val =~# "\\(^ *normal! 0\\|^ *exe ''normal!\\)"') let expected = [ \ 'normal! 016|', \ 'normal! 016|', @@ -96,7 +96,7 @@ func Test_mksession() call assert_equal(expected, li) tabclose! - call delete('test_mks.out') + call delete('Xtest_mks.out') call delete(tmpfile) let &wrap = wrap_save endfunc @@ -104,10 +104,10 @@ endfunc func Test_mksession_winheight() new set winheight=10 winminheight=2 - mksession! test_mks.out - source test_mks.out + mksession! Xtest_mks.out + source Xtest_mks.out - " call delete('test_mks.out') + call delete('Xtest_mks.out') endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index d3dc08885..aaeb258ef 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 258, +/**/ 257, /**/ 256, |