summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-30 15:08:27 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-30 15:08:27 +0200
commit4cc39a527fecc96ad6639f10c9389c66af828cf1 (patch)
treec866f1cf4473b85c0b1bacbb5acc0d6617a53cd8
parentb20545f2a718d4f19c3f609fd11c0ca4eff450ce (diff)
downloadvim-git-4cc39a527fecc96ad6639f10c9389c66af828cf1.tar.gz
patch 7.4.1805v7.4.1805
Problem: Running tests in shadow dir fails. Solution: Link the samples directory
-rw-r--r--src/Makefile1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 19b147c76..b3b8daf0b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2608,6 +2608,7 @@ shadow: runtime pixmaps
../../testdir/*.py \
../../testdir/python* \
../../testdir/sautest \
+ ../../testdir/samples \
../../testdir/test83-tags? \
../../testdir/*.ok .
diff --git a/src/version.c b/src/version.c
index e891af900..86f38e639 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1805,
+/**/
1804,
/**/
1803,