diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-11-29 23:40:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 23:40:29 +0100 |
| commit | 78cbed513894935ad69584f3cbf92ed7d58335b7 (patch) | |
| tree | fcab8da8a5bfc0c0c617099239deb5f558ead6e9 | |
| parent | 783c9aac8ee300ba3e9850de26b523554ceab495 (diff) | |
| parent | d24222cea82923cc69b190cefef5117aca890df2 (diff) | |
| download | rneovim-78cbed513894935ad69584f3cbf92ed7d58335b7.tar.gz rneovim-78cbed513894935ad69584f3cbf92ed7d58335b7.tar.bz2 rneovim-78cbed513894935ad69584f3cbf92ed7d58335b7.zip | |
Merge #5643 from Shougo/vim-7.4.1686
vim-patch:7.4.1686, 7.4.2007
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 34b6b846ca..d1857565a4 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -59,6 +59,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") @@ -131,6 +134,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 eaf44f42b8..4703c83484 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 @@ -758,7 +758,7 @@ static int included_patches[] = { // 1689 NA // 1688 NA // 1687 NA - // 1686, + 1686, // 1685, // 1684 NA // 1683 NA |