#endif
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include <lib-lib/str.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "pager.h"
-#include "mapping.h"
#include <wchar.h>
#include <ctype.h>
size_t len = m_strlen(*macro);
mbstate_t mbstate1, mbstate2;
- memset (&mbstate1, 0, sizeof (mbstate1));
- memset (&mbstate2, 0, sizeof (mbstate2));
+ p_clear(&mbstate1, 1);
+ p_clear(&mbstate2, 1);
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
if (k == (size_t) (-1) || k == (size_t) (-2)) {
}
if (ismacro > 0) {
- if (!str_cmp (Pager, "builtin"))
+ if (!m_strcmp(Pager, "builtin"))
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
n = COLS - col;
if (ismacro >= 0) {
- SKIPWS (t3);
+ t3 = vskipspaces(t3);
/* FIXME: this is completely wrong */
if ((n = m_strlen(t3)) > COLS - col) {
print_macro (f, n, &t3);
if (*t3) {
- if (str_cmp (Pager, "builtin")) {
+ if (m_strcmp(Pager, "builtin")) {
fputc ('\n', f);
n = 0;
}