diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-30 20:50:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-30 20:50:46 +0200 |
| commit | e9c07270031e312082604d3505650f185aa65948 (patch) | |
| tree | e63a095f5a5a76848987b213b4ecd3ea00729423 | |
| parent | 7db8f6f4f85e5d0526d23107b2a5e2334dc23354 (diff) | |
patch 7.4.1686v7.4.1686
Problem: When running tests $HOME/.viminfo is written. (James McCoy)
Solution: Add 'nviminfo' to the 'viminfo' option. (closes #722)
| -rw-r--r-- | src/testdir/runtest.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_backspace_opt.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_viminfo.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 0cf50006db..4d75af3ee9 100644 --- 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 index f80e831e9a..7fbba96c66 100644 --- 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 index 3efe75e826..a979ab9967 100644 --- 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 index 1b34431723..f2976cb22f 100644 --- 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, |