X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=6a7f5c1a45fad2462bab5476e8027928311285b9;hp=61058f75c63efc9600f3e025fc1b83ed4ce3437e;hb=9218fd9d7e2a7976b34683c60cb94f7fda42141a;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed diff --git a/keymap.c b/keymap.c index 61058f7..6a7f5c1 100644 --- a/keymap.c +++ b/keymap.c @@ -81,6 +81,9 @@ static struct mapping_t KeyNames[] = { {"", ' '}, #ifdef KEY_BTAB {"", KEY_BTAB}, +#endif +#ifdef KEY_NEXT + {"", KEY_NEXT}, #endif {NULL, 0} }; @@ -134,7 +137,7 @@ static int parse_keycode (const char *s) return -1; } -static int parsekeys (char *str, keycode_t * d, int max) +static int parsekeys (const char *str, keycode_t * d, int max) { int n, len = max; char buff[SHORT_STRING]; @@ -181,7 +184,7 @@ static int parsekeys (char *str, keycode_t * d, int max) /* insert a key sequence into the specified map. the map is sorted by ASCII * value (lowest to highest) */ -void km_bind (char *s, int menu, int op, char *macro, char *descr) +void km_bind (const char *s, int menu, int op, char *macro, char *descr) { struct keymap_t *map, *tmp, *last = NULL, *next; keycode_t buf[MAX_SEQ]; @@ -238,7 +241,7 @@ void km_bind (char *s, int menu, int op, char *macro, char *descr) Keymaps[menu] = map; } -void km_bindkey (char *s, int menu, int op) +void km_bindkey (const char *s, int menu, int op) { km_bind (s, menu, op, NULL, NULL); } @@ -256,7 +259,7 @@ static int get_op (struct binding_t *bindings, const char *start, size_t len) return OP_NULL; } -static char *get_func (struct binding_t *bindings, int op) +static const char *get_func (struct binding_t *bindings, int op) { int i; @@ -318,7 +321,7 @@ static void push_string (char *s) } } } - mutt_ungetch (*p--, 0); + mutt_ungetch ((unsigned char) *p--, 0); } } @@ -454,7 +457,7 @@ static void create_bindings (struct binding_t *map, int menu) char *km_keyname (int c) { static char buf[10]; - char *p; + const char *p; if ((p = mutt_getnamebyvalue (c, KeyNames))) return p;