#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>
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;