Skip to content

Commit 89b1042

Browse files
committed
patch 7.4.2031
Problem: The list_lbr_utf8 test fails if ~/.vim/syntax/c.vim sets 'textwidth' to a non-zero value. (Oyvind A. Holm) Solution: Add a setup.vim file that sets 'runtimepath' and $HOME to a safe value. (partly by Christian Brabandt, closes #912)
1 parent e048539 commit 89b1042

File tree

7 files changed

+25
-4
lines changed

7 files changed

+25
-4
lines changed

src/testdir/amiga.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
set shell=csh
33
map! /tmp t:
44
cmap !rm !Delete all
5+
6+
source setup.vim

src/testdir/dos.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ set shell=c:\COMMAND.COM shellquote= shellxquote= shellcmdflag=/c shellredir=>
55
if executable("cmd.exe")
66
set shell=cmd.exe
77
endif
8+
9+
source setup.vim

src/testdir/runtest.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ if &lines < 24 || &columns < 80
4242
cquit
4343
endif
4444

45+
" Common with all tests on all systems.
46+
source setup.vim
47+
4548
" For consistency run all tests with 'nocompatible' set.
4649
" This also enables use of line continuation.
4750
set nocp viminfo+=nviminfo
@@ -55,9 +58,6 @@ lang mess C
5558
" Always use forward slashes.
5659
set shellslash
5760

58-
" Make sure $HOME does not get read or written.
59-
let $HOME = '/does/not/exist'
60-
6161
let s:srcdir = expand('%:p:h:h')
6262

6363
" Prepare for calling test_garbagecollect_now().

src/testdir/setup.vim

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
" Common preparations for running tests.
2+
3+
" Make sure 'runtimepath' does not include $HOME.
4+
set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
5+
6+
" Only when the +eval feature is present.
7+
if 1
8+
" Make sure $HOME does not get read or written.
9+
let $HOME = '/does/not/exist'
10+
endif
11+

src/testdir/unix.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
" Settings for test script execution
22
" Always use "sh", don't use the value of "$SHELL".
33
set shell=sh
4+
5+
source setup.vim

src/testdir/vms.vim

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
" Settings for test script execution under OpenVMS
22

3-
" Do not make any swap files
3+
" Do not use any swap files
44
set noswapfile
5+
6+
source setup.vim

src/version.c

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

759759
static int included_patches[] =
760760
{ /* Add new patch number below this line */
761+
/**/
762+
2031,
761763
/**/
762764
2030,
763765
/**/

0 commit comments

Comments
 (0)