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)

diff --git a/src/message.c b/src/message.c
index ab193f0855ed74695881fee040c0986b378defcf..a4d2cc8f3a9732e0361b386de84e045353837d9d 100644 (file)
--- 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 992e5c29295ffc8fd87a2bac13d5fda99cf30a35..cfdfc4c4ac670b633a8f20f0901c99c14d151130 100644 (file)
--- 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 0c9731d3fc8b8f662232a3eb47d3c598c24323c0..26b5455ab9dddb999d31919df4ffb11ec9ecb3ba 100644 (file)
--- 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 */
+/**/
+    397,
 /**/
     396,
 /**/