X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=51a296f1de5e2ff9c001919597b7ca886952feb3;hp=716308a23a4d50bfa2e0a685a5cc70a99f74d90f;hb=f65ae399906906f734398432691dbacf2c7bda9f;hpb=4a0b020a3048f079979bea43c04f9fe388f9354d

diff --git a/keymap.c b/keymap.c
index 716308a..51a296f 100644
--- a/keymap.c
+++ b/keymap.c
@@ -7,16 +7,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#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-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
@@ -25,11 +16,6 @@
 #include "keymap.h"
 #include <lib-crypt/crypt.h>
 
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #define MUTT_FUNCTIONS_VALUES
 #include "functions.def"
 
@@ -478,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);