remove a whole lot of #include mutt.h

[apps/madmutt.git] / help.c

diff --git a/help.c b/help.c
index 0199398..0fa80c1 100644 (file)
--- a/help.c
+++ b/help.c
@@ -9,23 +9,12 @@
 
 #define HELP_C
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <wctype.h>
-#include <wchar.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
+#include "charset.h"
 #include "keymap.h"
 #include "pager.h"
 
@@ -97,10 +86,10 @@ static int print_macro (FILE * f, int maxwidth, const char **macro)
        *macro += k, len -= k) {
     if (k == -1 || k == -2) {
       k = (k == -1) ? 1 : len;
-      wc = replacement_char ();
+      wc = CharsetReplacement;
     }
     /* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */
-    if (IsWPrint (wc) && (w = wcwidth (wc)) >= 0) {
+    if (iswprint(wc) && (w = wcwidth (wc)) >= 0) {
       if (w > n)
         break;
       n -= w;