X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.h;h=0a0d42861bbc487a2074d2212ffc2f54fd486e21;hp=0f215c224c0895314075199da466adb47b9215a2;hb=de7b76abbd466db7bfc097f16cc1df4fe8389250;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc

diff --git a/keymap.h b/keymap.h
index 0f215c2..0a0d428 100644
--- a/keymap.h
+++ b/keymap.h
@@ -10,7 +10,7 @@
 #ifndef KEYMAP_H
 #define KEYMAP_H
 
-#include <lib-lib/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
@@ -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,25 +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
-
-#include "keymap_defs.h"
+#define MUTT_FUNCTIONS_PROTO
+#include "functions.def"
 
 #endif /* KEYMAP_H */
+#include "keymap_defs.h"