Skip to content

Commit f98246d

Browse files
committed
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.
1 parent d1ee004 commit f98246d

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

src/testdir/setup.vim

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
" Common preparations for running tests.
22

3+
" Only load this once.
4+
if 1
5+
if exists('s:did_load')
6+
finish
7+
endif
8+
let s:did_load = 1
9+
endif
10+
311
" Make sure 'runtimepath' and 'packpath' does not include $HOME.
412
set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
513
if has('packages')

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
806,
772774
/**/
773775
805,
774776
/**/

0 commit comments

Comments
 (0)