projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort out some prototypes, put them where they belong.
[apps/madmutt.git]
/
lib-ui
/
curs_lib.c
diff --git
a/lib-ui/curs_lib.c
b/lib-ui/curs_lib.c
index
125e5ca
..
de14e59
100644
(file)
--- a/
lib-ui/curs_lib.c
+++ b/
lib-ui/curs_lib.c
@@
-30,10
+30,7
@@
#include <langinfo.h>
#endif
#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-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
@@
-599,7
+596,7
@@
void mutt_format_string (char *dest, ssize_t destlen,
if (arboreal && wc < M_TREE_MAX)
w = 1; /* hack */
else {
if (arboreal && wc < M_TREE_MAX)
w = 1; /* hack */
else {
- if (!
IsWPrint
(wc))
+ if (!
iswprint
(wc))
wc = '?';
w = wcwidth (wc);
}
wc = '?';
w = wcwidth (wc);
}
@@
-691,7
+688,7
@@
void mutt_paddstr (int n, const char *s)
k = (k == -1) ? 1 : len;
wc = CharsetReplacement;
}
k = (k == -1) ? 1 : len;
wc = CharsetReplacement;
}
- if (!
IsWPrint
(wc))
+ if (!
iswprint
(wc))
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
@@
-728,7
+725,7
@@
int mutt_strwidth (const char *s)
k = (k == -1) ? 1 : n;
wc = CharsetReplacement;
}
k = (k == -1) ? 1 : n;
wc = CharsetReplacement;
}
- if (!
IsWPrint
(wc))
+ if (!
iswprint
(wc))
wc = '?';
w += wcwidth (wc);
}
wc = '?';
w += wcwidth (wc);
}