X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.h;h=1c26ed1751fee309b52ddebc552177858c784251;hp=4ec7dd3630e51bf68e847e9176c13478aec28c6c;hb=f435868132e200bfa71ac155f037cf64bf5414ba;hpb=53186676acf2c3b5509a614433eb00a2087cd4ec

diff --git a/keymap.h b/keymap.h
index 4ec7dd3..1c26ed1 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
@@ -41,7 +41,6 @@ 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 +53,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
 };
 
@@ -92,6 +79,5 @@ struct binding_t *km_get_table (int menu);
 #define MUTT_FUNCTIONS_PROTO
 #include "functions.def"
 
-#include "keymap_defs.h"
-
 #endif /* KEYMAP_H */
+#include "keymap_defs.h"