X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=5c9b9a605c77ee9afd1be38a24f411b102b0d038;hp=3a2f922c7eaf2f402c57002e1337fb7ead533653;hb=693bfbaf2d595042ed12eea010bf01bb0ea9c125;hpb=c0845f1be75f82fb29cc3a15d26b819041e39813 diff --git a/keymap.c b/keymap.c index 3a2f922..5c9b9a6 100644 --- a/keymap.c +++ b/keymap.c @@ -36,10 +36,7 @@ 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} @@ -116,7 +113,7 @@ static int parse_keycode (const char *s) static int parsekeys (const char *str, keycode_t * d, int max) { int n, len = max; - char buff[SHORT_STRING]; + char buff[STRING]; char c; char *s, *t; @@ -510,13 +507,11 @@ void km_init (void) create_bindings (OpSmime, MENU_KEY_SELECT_SMIME); #endif -#ifdef MIXMASTER create_bindings (OpMix, MENU_MIX); km_bindkey ("", MENU_MIX, OP_GENERIC_SELECT_ENTRY); km_bindkey ("h", MENU_MIX, OP_MIX_CHAIN_PREV); km_bindkey ("l", MENU_MIX, OP_MIX_CHAIN_NEXT); -#endif /* bindings for the line editor */ create_bindings (OpEditor, MENU_EDITOR); @@ -601,7 +596,7 @@ void km_init (void) void km_error_key (int menu) { - char buf[SHORT_STRING]; + char buf[STRING]; struct keymap_t *key; if (!(key = km_find_func (menu, OP_HELP))) @@ -733,11 +728,8 @@ struct binding_t *km_get_table (int menu) return OpSmime; #endif -#ifdef MIXMASTER case MENU_MIX: return OpMix; -#endif - } return NULL; }