patch 7.4.2027

Problem:    Can't build with +eval but without +menu.
Solution:   Add #ifdef. (John Marriott)

diff --git a/src/eval.c b/src/eval.c
index 779886431ea1eb4c8fff11aba0d3364f109bba52..6987485edcc5157cff4ff6e937ce71b51a23f43e 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -13120,11 +13120,13 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
        return;
     }
 
+# if defined(FEAT_MENU)
     if (xpc.xp_context == EXPAND_MENUS)
     {
        set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, FALSE);
        xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
     }
+# endif
 
     pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
     if ((rettv_list_alloc(rettv) != FAIL) && (pat != NULL))

diff --git a/src/version.c b/src/version.c
index a7a9a8bd90f11eafa39345a38db717639e15e0c9..93f3c03fa0617ed471edbd1407901a0c82a8f89a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2027,
 /**/
     2026,
 /**/