patch 7.4.2027

brammool · brammool · commit 4c06815c44df · 2016-07-11T23:15:25.000+02:00
Problem:    Can't build with +eval but without +menu.
Solution:   Add #ifdef. (John Marriott)
diff --git 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
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2027,
 /**/
     2026,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -13120,11 +13120,13 @@ f_getcompletion(typval_T argvars, typval_T rettv)`
`13120`	`13120`	`return;`
`13121`	`13121`	`}`
`13122`	`13122`
	`13123`	`+# if defined(FEAT_MENU)`
`13123`	`13124`	`if (xpc.xp_context == EXPAND_MENUS)`
`13124`	`13125`	`{`
`13125`	`13126`	`set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, FALSE);`
`13126`	`13127`	`xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);`
`13127`	`13128`	`}`
	`13129`	`+# endif`
`13128`	`13130`
`13129`	`13131`	`pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);`
`13130`	`13132`	`if ((rettv_list_alloc(rettv) != FAIL) && (pat != NULL))`