# HG changeset patch # User Christian Brabandt # Date 1501360204 -7200 # Node ID 825a4717f14ac3814cc04bd84ee1b0be0fc16ac5 # Parent c98345b2212585954dd6f2fbfecc1c5524848795 patch 8.0.0806: tests may try to create XfakeHOME twice commit https://github.com/vim/vim/commit/f98246d4849e670c6660e97887428dcddf88dc9f Author: Bram Moolenaar Date: Sat Jul 29 22:21:18 2017 +0200 patch 8.0.0806: tests may try to create XfakeHOME twice Problem: Tests may try to create XfakeHOME twice. Solution: Avoid loading setup.vim twice. diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim --- a/src/testdir/setup.vim +++ b/src/testdir/setup.vim @@ -1,5 +1,13 @@ " Common preparations for running tests. +" Only load this once. +if 1 + if exists('s:did_load') + finish + endif + let s:did_load = 1 +endif + " Make sure 'runtimepath' and 'packpath' does not include $HOME. set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after if has('packages') diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 806, +/**/ 805, /**/ 804,