From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 16 Mar 2020 20:08:31 +0000 (+0100)
Subject: patch 8.2.0395: build fails with FEAT_EVAL but without FEAT_MENU
X-Git-Tag: v8.2.0395
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2cbdea9685f9592ee22bda7b58953d2bbaa4c47;p=vim

patch 8.2.0395: build fails with FEAT_EVAL but without FEAT_MENU

Problem:    Build fails with FEAT_EVAL but without FEAT_MENU.
Solution:   Add #ifdef. (John Marriott)
---

diff --git a/src/evalfunc.c b/src/evalfunc.c
index fdfdc0a06..9a6187b20 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -646,7 +646,9 @@ static funcentry_T global_functions[] =
     {"matchstr",	2, 4, FEARG_1,	  ret_string,	f_matchstr},
     {"matchstrpos",	2, 4, FEARG_1,	  ret_list_any,	f_matchstrpos},
     {"max",		1, 1, FEARG_1,	  ret_any,	f_max},
+#ifdef FEAT_MENU
     {"menu_info",	1, 2, FEARG_1,	  ret_dict_any,	f_menu_info},
+#endif
     {"min",		1, 1, FEARG_1,	  ret_any,	f_min},
     {"mkdir",		1, 3, FEARG_1,	  ret_number,	f_mkdir},
     {"mode",		0, 1, FEARG_1,	  ret_string,	f_mode},
diff --git a/src/version.c b/src/version.c
index 717ca669e..27aedd56c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    395,
 /**/
     394,
 /**/