summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-01 20:40:39 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-01 20:40:39 +0100
commit5a66dfb25eb478c26176d993393a3b1b124edb39 (patch)
tree4bd7c35e770f8d9612cf3ec57c360bbfeee5cfc1
parent59716a27bd5c6c64def6c3ca430ff1246deae749 (diff)
downloadvim-git-5a66dfb25eb478c26176d993393a3b1b124edb39.tar.gz
patch 8.0.0397: can't build with +viminfo but without +evalv8.0.0397
Problem: Cannot build with the viminfo feature but without the eval feature. Solution: Adjust #ifdef. (John Marriott)
-rw-r--r--src/message.c2
-rw-r--r--src/misc2.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c
index ab193f085..a4d2cc8f3 100644
--- a/src/message.c
+++ b/src/message.c
@@ -539,7 +539,7 @@ emsg_not_now(void)
return FALSE;
}
-#ifdef FEAT_EVAL
+#if defined(FEAT_EVAL) || defined(PROTO)
static garray_T ignore_error_list = GA_EMPTY;
void
diff --git a/src/misc2.c b/src/misc2.c
index 992e5c292..cfdfc4c4a 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2099,7 +2099,7 @@ ga_concat_strings(garray_T *gap, char *sep)
return s;
}
-#if defined(FEAT_VIMINFO) || defined(PROTO)
+#if defined(FEAT_VIMINFO) || defined(FEAT_EVAL) || defined(PROTO)
/*
* Make a copy of string "p" and add it to "gap".
* When out of memory nothing changes.
diff --git a/src/version.c b/src/version.c
index 0c9731d3f..26b5455ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 397,
+/**/
396,
/**/
395,