#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>
n = COLS - col;
if (ismacro >= 0) {
- SKIPWS (t3);
+ t3 = vskipspaces(t3);
/* FIXME: this is completely wrong */
if ((n = m_strlen(t3)) > COLS - col) {