# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1459364413 -7200
# Node ID fb764adba294689ab6e2e468e5969b52f28b64a2
# Parent  aba2d0a01290fa429e376801a7a3b6705875e870
commit https://github.com/vim/vim/commit/e9c07270031e312082604d3505650f185aa65948
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 30 20:50:46 2016 +0200

    patch 7.4.1686
    Problem:    When running tests $HOME/.viminfo is written. (James McCoy)
    Solution:   Add 'nviminfo' to the 'viminfo' option. (closes https://github.com/vim/vim/issues/722)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -55,6 +55,9 @@ lang mess C
 " Always use forward slashes.
 set shellslash
 
+" Make sure $HOME does not get read or written.
+let $HOME = '/does/not/exist'
+
 let s:srcdir = expand('%:p:h:h')
 
 " Support function: get the alloc ID by name.
@@ -141,7 +144,6 @@ for s:test in sort(s:tests)
     call extend(s:errors, v:errors)
     let v:errors = []
   endif
-
 endfor
 
 if s:fail == 0
diff --git a/src/testdir/test_backspace_opt.vim b/src/testdir/test_backspace_opt.vim
--- a/src/testdir/test_backspace_opt.vim
+++ b/src/testdir/test_backspace_opt.vim
@@ -53,7 +53,7 @@ func Test_backspace_option()
   " Cleared when 'compatible' is set
   set compatible
   call assert_equal('', &backspace)
-  set nocompatible
+  set nocompatible viminfo+=nviminfo
 endfunc
 
 " vim: tabstop=2 shiftwidth=0 expandtab
diff --git a/src/testdir/test_viminfo.vim b/src/testdir/test_viminfo.vim
--- a/src/testdir/test_viminfo.vim
+++ b/src/testdir/test_viminfo.vim
@@ -36,7 +36,7 @@ func Test_global_vars()
   " store a really long list, so line wrapping will occur in viminfo file
   let test_list = range(1,100)
   let g:MY_GLOBAL_LIST = test_list
-  set viminfo='100,<50,s10,h,!
+  set viminfo='100,<50,s10,h,!,nviminfo
   wv! Xviminfo
   unlet g:MY_GLOBAL_DICT
   unlet g:MY_GLOBAL_LIST
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1686,
+/**/
     1685,
 /**/
     1684,