X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=7be686949cefcc70bec4b80b8ed8f482de984667;hp=51a296f1de5e2ff9c001919597b7ca886952feb3;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=1ee89902de184a640c171ae3285bff6882a791bd diff --git a/keymap.c b/keymap.c index 51a296f..7be6869 100644 --- a/keymap.c +++ b/keymap.c @@ -36,19 +36,15 @@ struct mapping_t Menus[] = { {"key_select_smime", MENU_KEY_SELECT_SMIME}, #endif - #ifdef MIXMASTER {"mix", MENU_MIX}, #endif - {"query", MENU_QUERY}, {"generic", MENU_GENERIC}, {NULL, 0} }; -#define mutt_check_menu(s) mutt_getvaluebyname(s, Menus) - static struct mapping_t KeyNames[] = { {"", KEY_PPAGE}, {"", KEY_NPAGE}, @@ -673,7 +669,7 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus, if (q) *q = '\0'; - if ((menu[i] = mutt_check_menu (p)) == -1) { + if ((menu[i] = mutt_getvaluebyname(p, Menus)) == -1) { snprintf (err->data, err->dsize, _("%s: no such menu"), p); goto error; }