From: Bram Moolenaar Date: Mon, 11 Jul 2016 21:15:25 +0000 (+0200) Subject: patch 7.4.2027 X-Git-Tag: v7.4.2027 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c06815c44dfeaafdad25dfcc40f60860096a900;p=vim 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 779886431..6987485ed 100644 --- 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 a7a9a8bd9..93f3c03fa 100644 --- 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, /**/