summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-06 19:24:23 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-06 19:24:23 +0200
commit328604307ba26e3182eb0b096e820f9cd346c2dd (patch)
tree20d80f89d0bc6456a58a432f52bab90ebfd6f6f5 /src
parent83b3c3d8a0fa1afed06c13163b9f72c0925f2a61 (diff)
downloadvim-git-328604307ba26e3182eb0b096e820f9cd346c2dd.tar.gz
patch 7.4.2166v7.4.2166
Problem: Small build can't run startup test. Solution: Skip the test.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_startup.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index da6a3f6f8..047bc34a2 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -15,6 +15,9 @@ endfunc
" 2. packages
" 3. plugins in after directories
func Test_after_comes_later()
+ if !has('packages')
+ return
+ endif
let before = [
\ 'let $HOME = "/does/not/exist"',
\ 'set loadplugins',
diff --git a/src/version.c b/src/version.c
index e3ecd93c7..2add5968f 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 */
/**/
+ 2166,
+/**/
2165,
/**/
2164,