changeset 11016:4e7308525fe7 v8.0.0397

patch 8.0.0397: can't build with +viminfo but without +eval commit https://github.com/vim/vim/commit/5a66dfb25eb478c26176d993393a3b1b124edb39 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 1 20:40:39 2017 +0100 patch 8.0.0397: can't build with +viminfo but without +eval Problem: Cannot build with the viminfo feature but without the eval feature. Solution: Adjust #ifdef. (John Marriott)
author Christian Brabandt <cb@256bit.org>
date Wed, 01 Mar 2017 20:45:06 +0100
parents 53ecc645c32d
children da1cbfa57265
files src/message.c src/misc2.c src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2099,7 +2099,7 @@ ga_concat_strings(garray_T *gap, char *s
     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.
--- 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,