projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
leftovers
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
17ee21f
..
106df72
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-14,7
+14,7
@@
#include "mutt.h"
#include "keymap.h"
#include "mutt.h"
#include "keymap.h"
-#include
<lib-crypt/crypt.h>
+#include
"crypt.h"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
@@
-57,7
+57,7
@@
static struct mapping_t KeyNames[] = {
#ifdef KEY_ENTER
{"<Enter>", KEY_ENTER},
#endif
#ifdef KEY_ENTER
{"<Enter>", KEY_ENTER},
#endif
- {"<Return>",
M_ENTER_C
},
+ {"<Return>",
'\n'
},
{"<Esc>", '\033'},
{"<Tab>", '\t'},
{"<Space>", ' '},
{"<Esc>", '\033'},
{"<Tab>", '\t'},
{"<Space>", ' '},
@@
-501,12
+501,8
@@
void km_init (void)
create_bindings (OpAlias, MENU_ALIAS);
create_bindings (OpPgp, MENU_PGP);
create_bindings (OpSmime, MENU_SMIME);
create_bindings (OpAlias, MENU_ALIAS);
create_bindings (OpPgp, MENU_PGP);
create_bindings (OpSmime, MENU_SMIME);
-
-#ifdef CRYPT_BACKEND_GPGME
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
-#endif
-
create_bindings (OpMix, MENU_MIX);
km_bindkey ("<space>", MENU_MIX, OP_GENERIC_SELECT_ENTRY);
create_bindings (OpMix, MENU_MIX);
km_bindkey ("<space>", MENU_MIX, OP_GENERIC_SELECT_ENTRY);
@@
-720,14
+716,10
@@
struct binding_t *km_get_table (int menu)
return OpQuery;
case MENU_PGP:
return OpPgp;
return OpQuery;
case MENU_PGP:
return OpPgp;
-
-#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP:
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
case MENU_KEY_SELECT_PGP:
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
-#endif
-
case MENU_MIX:
return OpMix;
}
case MENU_MIX:
return OpMix;
}