aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShougo Matsushita <Shougo.Matsu@gmail.com>2016-11-22 07:28:50 +0900
committerShougo Matsushita <Shougo.Matsu@gmail.com>2016-11-22 07:30:42 +0900
commit071a7d3d786af5b7be04a095e40327a064365550 (patch)
tree619f9935d2cafa83a0cb96b73e371fafa58f2115
parent5f0260808cf3712718555ee177476b8aefd78280 (diff)
downloadrneovim-071a7d3d786af5b7be04a095e40327a064365550.tar.gz
rneovim-071a7d3d786af5b7be04a095e40327a064365550.tar.bz2
rneovim-071a7d3d786af5b7be04a095e40327a064365550.zip
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
-rw-r--r--src/nvim/testdir/runtest.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 1 deletions
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