diff options
| author | Petter Wahlman <petter@wahlman.no> | 2019-03-10 19:05:48 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-03-10 19:05:48 +0100 |
| commit | c99bff5f56de2ecd87e7bf8da1ff3ba2c04255d7 (patch) | |
| tree | 544304dbe87e4fccb51464bb19a2c60a30493fa7 | |
| parent | ef5037e7f6e199ade4475d819842e66eb3bd8381 (diff) | |
| download | rneovim-c99bff5f56de2ecd87e7bf8da1ff3ba2c04255d7.tar.gz rneovim-c99bff5f56de2ecd87e7bf8da1ff3ba2c04255d7.tar.bz2 rneovim-c99bff5f56de2ecd87e7bf8da1ff3ba2c04255d7.zip | |
cleanup: rename menu_nable_recurse() #9707
| -rw-r--r-- | src/nvim/menu.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/nvim/menu.c b/src/nvim/menu.c index aea297fce2..523bb20738 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -171,7 +171,7 @@ ex_menu(exarg_T *eap) if (enable != kNone) { // Change sensitivity of the menu. // For the PopUp menu, remove a menu for each mode separately. - // Careful: menu_nable_recurse() changes menu_path. + // Careful: menu_enable_recurse() changes menu_path. if (STRCMP(menu_path, "*") == 0) { // meaning: do all menus menu_path = (char_u *)""; } @@ -180,11 +180,11 @@ ex_menu(exarg_T *eap) for (i = 0; i < MENU_INDEX_TIP; ++i) if (modes & (1 << i)) { p = popup_mode_name(menu_path, i); - menu_nable_recurse(root_menu, p, MENU_ALL_MODES, enable); + menu_enable_recurse(root_menu, p, MENU_ALL_MODES, enable); xfree(p); } } - menu_nable_recurse(root_menu, menu_path, modes, enable); + menu_enable_recurse(root_menu, menu_path, modes, enable); } else if (unmenu) { /* * Delete menu(s). @@ -485,7 +485,10 @@ erret: * Set the (sub)menu with the given name to enabled or disabled. * Called recursively. */ -static int menu_nable_recurse(vimmenu_T *menu, char_u *name, int modes, int enable) +static int menu_enable_recurse(vimmenu_T *menu, + char_u *name, + int modes, + int enable) { char_u *p; @@ -503,13 +506,14 @@ static int menu_nable_recurse(vimmenu_T *menu, char_u *name, int modes, int enab EMSG(_(e_notsubmenu)); return FAIL; } - if (menu_nable_recurse(menu->children, p, modes, enable) - == FAIL) + if (menu_enable_recurse(menu->children, p, modes, enable) == FAIL) { return FAIL; - } else if (enable) + } + } else if (enable) { menu->enabled |= modes; - else + } else { menu->enabled &= ~modes; + } /* * When name is empty, we are doing all menu items for the given |