kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-26 06:05:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Deal with NOP, add actext to output

Browse Source
This commit is contained in:
KillTheMule 2017-10-02 14:55:19 +02:00
parent 9fb8b47ad8
commit 41f624a85b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/menu.c
View File

@ -682,6 +682,10 @@ static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
tv_dict_add_str(dict, S_LEN("shortcut"), buf); tv_dict_add_str(dict, S_LEN("shortcut"), buf);
} }
if (menu->actext) {
tv_dict_add_str(dict, S_LEN("actext"), (char *)menu->actext);
}
if (menu->modes & MENU_TIP_MODE && menu->strings[MENU_INDEX_TIP]) { if (menu->modes & MENU_TIP_MODE && menu->strings[MENU_INDEX_TIP]) {
tv_dict_add_str(dict, S_LEN("tooltip"), tv_dict_add_str(dict, S_LEN("tooltip"),
(char *)menu->strings[MENU_INDEX_TIP]); (char *)menu->strings[MENU_INDEX_TIP]);
@ -695,13 +699,9 @@ static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
for (int bit = 0; bit < MENU_MODES; bit++) { for (int bit = 0; bit < MENU_MODES; bit++) {
if ((menu->modes & modes & (1 << bit)) != 0) { if ((menu->modes & modes & (1 << bit)) != 0) {
dict_T *impl = tv_dict_alloc(); dict_T *impl = tv_dict_alloc();
if (*menu->strings[bit] == NUL) { tv_dict_add_allocated_str(impl, S_LEN("rhs"),
tv_dict_add_str(impl, S_LEN("rhs"), (char *)"<Nop>"); str2special_save((char *)menu->strings[bit],
} else { false, false));
tv_dict_add_allocated_str(impl, S_LEN("rhs"),
str2special_save((char *)menu->strings[bit],
false, false));
}
tv_dict_add_nr(impl, S_LEN("silent"), menu->silent[bit]); tv_dict_add_nr(impl, S_LEN("silent"), menu->silent[bit]);
tv_dict_add_nr(impl, S_LEN("enabled"), tv_dict_add_nr(impl, S_LEN("enabled"),
(menu->enabled & (1 << bit)) ? 1 : 0); (menu->enabled & (1 << bit)) ? 1 : 0);