projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix shadow declaration and tag unused attribute
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
e80e5a3
..
7be6869
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-7,10
+7,6
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
@@
-20,11
+16,6
@@
#include "keymap.h"
#include <lib-crypt/crypt.h>
#include "keymap.h"
#include <lib-crypt/crypt.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
@@
-45,19
+36,15
@@
struct mapping_t Menus[] = {
{"key_select_smime", MENU_KEY_SELECT_SMIME},
#endif
{"key_select_smime", MENU_KEY_SELECT_SMIME},
#endif
-
#ifdef MIXMASTER
{"mix", MENU_MIX},
#endif
#ifdef MIXMASTER
{"mix", MENU_MIX},
#endif
-
{"query", MENU_QUERY},
{"generic", MENU_GENERIC},
{NULL, 0}
};
{"query", MENU_QUERY},
{"generic", MENU_GENERIC},
{NULL, 0}
};
-#define mutt_check_menu(s) mutt_getvaluebyname(s, Menus)
-
static struct mapping_t KeyNames[] = {
{"<PageUp>", KEY_PPAGE},
{"<PageDown>", KEY_NPAGE},
static struct mapping_t KeyNames[] = {
{"<PageUp>", KEY_PPAGE},
{"<PageDown>", KEY_NPAGE},
@@
-682,7
+669,7
@@
static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
if (q)
*q = '\0';
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;
}
snprintf (err->data, err->dsize, _("%s: no such menu"), p);
goto error;
}