From 43da7ea27b3391a9e74c658b90a5ed1cae926d40 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 15:50:09 -0400
Subject: vim-patch:8.0.0258

Problem:    mksession test leaves file behind.
Solution:   Delete the file.  Rename files to start with "X".

https://github.com/vim/vim/commit/c9b56b2ceb4662f87c39ea07ba5090a073fd6286
---
 src/nvim/testdir/test_mksession.vim | 14 +++++++-------
 src/nvim/version.c                  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim
index 284bafab75..7158b31a14 100644
--- a/src/nvim/testdir/test_mksession.vim
+++ b/src/nvim/testdir/test_mksession.vim
@@ -21,7 +21,7 @@ func Test_mksession()
     \   'aä Ä  two multiByte characters',
     \   'Aäöü  three mulTibyte characters'
     \ ])
-  let tmpfile = tempname()
+  let tmpfile = 'Xtemp'
   exec 'w! ' . tmpfile
   /^start:
   set wrap
@@ -62,8 +62,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|',
@@ -95,7 +95,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
@@ -103,10 +103,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
 
 " Verify that arglist is stored correctly to the session file.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f2686eacec..580ed592ca 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -694,7 +694,7 @@ static const int included_patches[] = {
   // 261,
   // 260 NA
   259,
-  // 258,
+  258,
   // 257 NA
   // 256,
   // 255,
-- 
cgit