Evtloop fixes.

[apps/madmutt.git] / keymap.h

diff --git a/keymap.h b/keymap.h
index 45829b6..aceb5eb 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -10,14 +10,11 @@
 #ifndef KEYMAP_H
 #define KEYMAP_H
 
-#include "mapping.h"
+#include <lib-lib/lib-lib.h>
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */
 #define MAX_SEQ 8
 
-/* flags for km_dokey() */
-#define M_KM_UNBUFFERED 1       /* don't read from the key buffer */
-
 /* type for key storage, the rest of mutt works fine with int type */
 typedef short keycode_t;
 
@@ -36,12 +33,11 @@ struct keymap_t {
   keycode_t *keys;              /* key sequence */
 };
 
-char *km_keyname (int);
+const char *km_keyname (int);
 int km_expand_key (char *, size_t, struct keymap_t *);
 struct keymap_t *km_find_func (int, int);
 void km_init (void);
 void km_error_key (int);
-void mutt_what_key (void);
 
 enum {
   MENU_ALIAS,
@@ -54,22 +50,10 @@ enum {
   MENU_PAGER,
   MENU_POST,
   MENU_QUERY,
-
-
   MENU_PGP,
   MENU_SMIME,
-
-#ifdef CRYPT_BACKEND_GPGME
   MENU_KEY_SELECT_PGP,
   MENU_KEY_SELECT_SMIME,
-#endif
-
-#ifdef MIXMASTER
-  MENU_MIX,
-#endif
-
-
-
   MENU_MAX
 };
 
@@ -89,25 +73,8 @@ struct binding_t {
 
 struct binding_t *km_get_table (int menu);
 
-extern struct binding_t OpGeneric[];
-extern struct binding_t OpPost[];
-extern struct binding_t OpMain[];
-extern struct binding_t OpAttach[];
-extern struct binding_t OpPager[];
-extern struct binding_t OpCompose[];
-extern struct binding_t OpBrowser[];
-extern struct binding_t OpEditor[];
-extern struct binding_t OpQuery[];
-extern struct binding_t OpAlias[];
-
-extern struct binding_t OpPgp[];
-
-extern struct binding_t OpSmime[];
-
-#ifdef MIXMASTER
-extern struct binding_t OpMix[];
-#endif
-
-#include "keymap_defs.h"
+#define MUTT_FUNCTIONS_PROTO
+#include "functions.def"
 
 #endif /* KEYMAP_H */
+#include "keymap_defs.h"