diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-03-04 10:59:44 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2019-03-16 19:53:21 +0100 |
| commit | be8ebba325451b387c0aedacfcda6c53e6c51188 (patch) | |
| tree | 6ee90da21194166b5163fa6375e4f50ab1813626 /src/nvim/option.c | |
| parent | 175398f21645552b708a7626309b826ae0f3d8a8 (diff) | |
| download | rneovim-be8ebba325451b387c0aedacfcda6c53e6c51188.tar.gz rneovim-be8ebba325451b387c0aedacfcda6c53e6c51188.tar.bz2 rneovim-be8ebba325451b387c0aedacfcda6c53e6c51188.zip | |
Allow using internal popupmenu or ext_popupmenu for wildmenu
Deprecate ext_wildmenu. ext_popupmenu already contains more state (anchor
position), and will allow further expansion (info about items).
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 2346c84b54..ad0ccd9f15 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -284,7 +284,6 @@ static char *(p_ambw_values[]) = { "single", "double", NULL }; static char *(p_bg_values[]) = { "light", "dark", NULL }; static char *(p_nf_values[]) = { "bin", "octal", "hex", "alpha", NULL }; static char *(p_ff_values[]) = { FF_UNIX, FF_DOS, FF_MAC, NULL }; -static char *(p_wop_values[]) = { "tagfile", NULL }; static char *(p_wak_values[]) = { "yes", "menu", "no", NULL }; static char *(p_mousem_values[]) = { "extend", "popup", "popup_setpos", "mac", NULL }; @@ -2608,11 +2607,11 @@ ambw_end: else if (varp == &p_wim) { if (check_opt_wim() == FAIL) errmsg = e_invarg; - } - /* 'wildoptions' */ - else if (varp == &p_wop) { - if (check_opt_strings(p_wop, p_wop_values, TRUE) != OK) + // 'wildoptions' + } else if (varp == &p_wop) { + if (opt_strings_flags(p_wop, p_wop_values, &wop_flags, true) != OK) { errmsg = e_invarg; + } } /* 'winaltkeys' */ else if (varp == &p_wak) { |