* 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-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.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"
{"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[] = {
{"<PageUp>", KEY_PPAGE},
{"<PageDown>", KEY_NPAGE},
}
else if (c >= KEY_F0 && c < KEY_F (256)) /* this maximum is just a guess */
sprintf (buf, "<F%d>", c - KEY_F0);
- else if (IsPrint (c))
+ else if (isprint((unsigned char)c))
snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
else
snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);
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;
}