diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-11 23:15:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-11 23:15:25 +0200 |
| commit | 4c06815c44dfeaafdad25dfcc40f60860096a900 (patch) | |
| tree | 76278f4efa2ed9732078230e1177f926ad029323 | |
| parent | 1436d8d51cce114be56209924fc71376407e5bad (diff) | |
| download | vim-git-4c06815c44dfeaafdad25dfcc40f60860096a900.tar.gz | |
patch 7.4.2027v7.4.2027
Problem: Can't build with +eval but without +menu.
Solution: Add #ifdef. (John Marriott)
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
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 @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2027, +/**/ 2026, /**/ 2025, |