diff options
| author | Shougo <Shougo.Matsu@gmail.com> | 2017-01-16 20:50:43 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-01-16 12:50:43 +0100 |
| commit | fa94c4c2d917b70df443ba0ebcd87da35dc1bb30 (patch) | |
| tree | b48e238dea8f72b3e91f6c83136fdb5233af44a0 | |
| parent | 95a4244587ef8e474da53f4a3d21ec3055746211 (diff) | |
| download | rneovim-fa94c4c2d917b70df443ba0ebcd87da35dc1bb30.tar.gz rneovim-fa94c4c2d917b70df443ba0ebcd87da35dc1bb30.tar.bz2 rneovim-fa94c4c2d917b70df443ba0ebcd87da35dc1bb30.zip | |
vim-patch:7.4.2031 (#5955)
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 vim/vim#912)
https://github.com/vim/vim/commit/89b10421ca1aea55acbafac1df93be4e20210ceb
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/setup.vim | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 20863bbaf3..eb5912086b 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -39,6 +39,9 @@ if &lines < 24 || &columns < 80 cquit endif +" Common with all tests on all systems. +source setup.vim + " This also enables use of line continuation. set viminfo+=nviminfo @@ -59,9 +62,6 @@ lang mess C " Always use forward slashes. set shellslash -" Make sure $HOME does not get read or written. -let $HOME = '/does/not/exist' - " Align with vim defaults. set directory^=. set nohidden diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim new file mode 100644 index 0000000000..52876d1e6c --- /dev/null +++ b/src/nvim/testdir/setup.vim @@ -0,0 +1,7 @@ +" Common preparations for running tests. + +" Make sure 'runtimepath' does not include $HOME. +set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after + +" Make sure $HOME does not get read or written. +let $HOME = '/does/not/exist' diff --git a/src/nvim/version.c b/src/nvim/version.c index acaad38ca2..93dd72f7fa 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -409,7 +409,7 @@ static int included_patches[] = { // 2034 NA 2033, // 2032 NA - // 2031, + 2031, // 2030 NA // 2029, 2028, |