summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-06 19:45:31 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-06 19:45:31 +0200
commitc96a2f3b887d9a1f850f0dacc92616bee11f966b (patch)
treed823255818373ba7e9d48147e6da25054a05ac1e
parent328604307ba26e3182eb0b096e820f9cd346c2dd (diff)
downloadvim-c96a2f3b887d9a1f850f0dacc92616bee11f966b.zip
patch 7.4.2167
Problem: Small build can't run tests. Solution: Don't try setting 'packpath'.
-rw-r--r--src/testdir/setup.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index dee3de212..a02840158 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -2,7 +2,9 @@
" Make sure 'runtimepath' and 'packpath' does not include $HOME.
set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
-let &packpath = &rtp
+if has('packages')
+ let &packpath = &rtp
+endif
" Only when the +eval feature is present.
if 1
diff --git a/src/version.c b/src/version.c
index 2add5968f..d5623c4cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2167,
+/**/
2166,
/**/
2165,