From 071a7d3d786af5b7be04a095e40327a064365550 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Tue, 22 Nov 2016 07:28:50 +0900
Subject: vim-patch:7.4.1686

Problem:    When running tests $HOME/.viminfo is written. (James McCoy)
Solution:   Add 'nviminfo' to the 'viminfo' option. (closes vim/vim#722)

https://github.com/vim/vim/commit/e9c07270031e312082604d3505650f185aa65948
---
 src/nvim/testdir/runtest.vim | 3 +++
 src/nvim/version.c           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index e2d1e67a22..acd2037912 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -51,6 +51,9 @@ lang mess C
 " Always use forward slashes.
 set shellslash
 
+" Make sure $HOME does not get read or written.
+let $HOME = '/does/not/exist'
+
 function RunTheTest(test)
   echo 'Executing ' . a:test
   if exists("*SetUp")
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8f3619f1e8..a4d0c376ff 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -758,7 +758,7 @@ static int included_patches[] = {
   // 1689 NA
   // 1688 NA
   // 1687 NA
-  // 1686,
+  1686,
   // 1685,
   // 1684 NA
   // 1683 NA
-- 
cgit 


From d24222cea82923cc69b190cefef5117aca890df2 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Fri, 25 Nov 2016 06:39:10 +0900
Subject: vim-patch:7.4.2007

Problem:    Running the tests leaves a viminfo file behind.
Solution:   Make the viminfo option empty.

https://github.com/vim/vim/commit/fc4ad616073a169badfb2b9906fee2844f76f730
---
 src/nvim/testdir/runtest.vim | 3 +++
 src/nvim/version.c           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index acd2037912..8b56d4007f 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -126,6 +126,9 @@ for s:test in sort(s:tests)
 
 endfor
 
+" Don't write viminfo on exit.
+set viminfo=
+
 if s:fail == 0
   " Success, create the .res file so that make knows it's done.
   exe 'split ' . fnamemodify(g:testname, ':r') . '.res'
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a4d0c376ff..89928a88f4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -435,7 +435,7 @@ static int included_patches[] = {
   // 2010,
   // 2009,
   // 2008,
-  // 2007,
+  2007,
   // 2006,
   // 2005,
   // 2004 NA
-- 
cgit