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