X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.h;h=58affcbbc3b846ccb8839d927463837134e4732b;hp=45829b699867ece52a8490fb049d061134927b3c;hb=9120e2c008281fb4acb9048545aa67873197b1d1;hpb=5e53f9e5f65aa5b3af6f5af9d868403536534afb

diff --git a/keymap.h b/keymap.h
index 45829b6..58affcb 100644
--- a/keymap.h
+++ b/keymap.h
@@ -10,7 +10,7 @@
 #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
@@ -36,7 +36,7 @@ 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);
@@ -54,22 +54,11 @@ 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,24 +78,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
+#define MUTT_FUNCTIONS_PROTO
+#include "functions.def"
 
 #include "keymap_defs.h"