X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=fb65b648c860c2c3e6d95d918764d142449ec53a;hb=f779db722043d8c6767149a9afef8c10159516f5;hp=125e5ca07d400910353918d43b840b410b69d187;hpb=fdb93a08e305b8755260144807e4d45106a9cb9f;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 125e5ca..fb65b64 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -11,30 +11,13 @@
  * 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 <wchar.h>
-#include <wctype.h>
 #include <termios.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
 #ifdef HAVE_LANGINFO_YESEXPR
 #include <langinfo.h>
 #endif
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_signal.h>
 
@@ -599,7 +582,7 @@ void mutt_format_string (char *dest, ssize_t destlen,
     if (arboreal && wc < M_TREE_MAX)
       w = 1;                    /* hack */
     else {
-      if (!IsWPrint (wc))
+      if (!iswprint(wc))
         wc = '?';
       w = wcwidth (wc);
     }
@@ -691,7 +674,7 @@ void mutt_paddstr (int n, const char *s)
       k = (k == -1) ? 1 : len;
       wc = CharsetReplacement;
     }
-    if (!IsWPrint (wc))
+    if (!iswprint(wc))
       wc = '?';
     w = wcwidth (wc);
     if (w >= 0) {
@@ -728,7 +711,7 @@ int mutt_strwidth (const char *s)
       k = (k == -1) ? 1 : n;
       wc = CharsetReplacement;
     }
-    if (!IsWPrint (wc))
+    if (!iswprint(wc))
       wc = '?';
     w += wcwidth (wc);
   }