X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=keymap.c;h=51a296f1de5e2ff9c001919597b7ca886952feb3;hb=1ee89902de184a640c171ae3285bff6882a791bd;hp=e8bd3978c4ed03c469e3dbe2ac8910825c3b91f4;hpb=170858b383d48f00f5539517d668a1c41aa80cb1;p=apps%2Fmadmutt.git

diff --git a/keymap.c b/keymap.c
index e8bd397..51a296f 100644
--- a/keymap.c
+++ b/keymap.c
@@ -7,28 +7,15 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include <lib-crypt/crypt.h>
 
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #define MUTT_FUNCTIONS_VALUES
 #include "functions.def"
 
@@ -477,7 +464,7 @@ const char *km_keyname(int c)
   }
   else if (c >= KEY_F0 && c < KEY_F (256))      /* this maximum is just a guess */
     sprintf (buf, "<F%d>", c - KEY_F0);
-  else if (IsPrint (c))
+  else if (isprint((unsigned char)c))
     snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
   else
     snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);