force our cflags in subdirs as well.

[apps/madmutt.git] / keymap.c

diff --git a/keymap.c b/keymap.c
index 9b501f2..6a7f5c1 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -12,6 +12,8 @@
 #endif
 
 #include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -79,6 +81,9 @@ static struct mapping_t KeyNames[] = {
   {"<Space>", ' '},
 #ifdef KEY_BTAB
   {"<BackTab>", KEY_BTAB},
+#endif
+#ifdef KEY_NEXT
+  {"<Next>",    KEY_NEXT},
 #endif
   {NULL, 0}
 };
@@ -132,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];
@@ -179,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];
@@ -236,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);
 }
@@ -254,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;
 
@@ -316,7 +321,7 @@ static void push_string (char *s)
         }
       }
     }
-    mutt_ungetch (*p--, 0);
+    mutt_ungetch ((unsigned char) *p--, 0);
   }
 }
 
@@ -452,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;