summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-16 21:08:31 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-16 21:08:31 +0100
commita2cbdea9685f9592ee22bda7b58953d2bbaa4c47 (patch)
treed5c267fe30dc15be14a30cac8ab8559778b20a20
parent7f009dfa064240d9024b76212535a35231912511 (diff)
downloadvim-git-a2cbdea9685f9592ee22bda7b58953d2bbaa4c47.tar.gz
patch 8.2.0395: build fails with FEAT_EVAL but without FEAT_MENUv8.2.0395
Problem: Build fails with FEAT_EVAL but without FEAT_MENU. Solution: Add #ifdef. (John Marriott)
-rw-r--r--src/evalfunc.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
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
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 395,
+/**/
394,
/**/
393,