changeset 8796:fb764adba294 v7.4.1686

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)
author Christian Brabandt <cb@256bit.org>
date Wed, 30 Mar 2016 21:00:13 +0200
parents aba2d0a01290
children d007d789682a
files src/testdir/runtest.vim src/testdir/test_backspace_opt.vim src/testdir/test_viminfo.vim src/version.c
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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,