ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: condense three comments to one, and do the masking more directly

master
Benno Schulenberg 2020-01-20 18:57:25 +01:00
parent 0ff9499583
commit 998992ddcb
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rcfile.c
View File

@ -806,25 +806,24 @@ void parse_binding(char *ptr, bool dobind)
if (!dobind) if (!dobind)
goto free_things; goto free_things;
/* Limit the given menu to those where the function exists;
* first handle three special cases, then the general case. */
if (is_universal(newsc->func)) if (is_universal(newsc->func))
mask = MMOST|MBROWSER; menu &= MMOST|MBROWSER;
#ifndef NANO_TINY #ifndef NANO_TINY
/* Handle the special case of the toggles. */
else if (newsc->func == do_toggle_void) else if (newsc->func == do_toggle_void)
mask = MMAIN; menu &= MMAIN;
#endif #endif
/* Handle the special case of a key defined as a string. */
else if (newsc->func == (functionptrtype)implant) else if (newsc->func == (functionptrtype)implant)
mask = MMOST|MBROWSER|MHELP; menu &= MMOST|MBROWSER|MHELP;
else { else {
/* Tally up the menus where the function exists. */ /* Tally up the menus where the function exists. */
for (funcstruct *f = allfuncs; f != NULL; f = f->next) for (funcstruct *f = allfuncs; f != NULL; f = f->next)
if (f->func == newsc->func) if (f->func == newsc->func)
mask = mask | f->menus; mask |= f->menus;
}
/* Now limit the given menu to those where the function exists. */ menu &= mask;
menu = menu & mask; }
if (!menu) { if (!menu) {
if (!ISSET(RESTRICTED) && !ISSET(VIEW_MODE)) if (!ISSET(RESTRICTED) && !ISSET(VIEW_MODE))