X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=c0b22525a10cee5570dbde8efa28aeb1c503233b;hp=f01bbea58f9eff5e3e2c4f69b8b3df6954103ee9;hb=97677c08933e16e25ecb3c12473ef1efdab7962b;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/help.c b/help.c
index f01bbea..c0b2252 100644
--- a/help.c
+++ b/help.c
@@ -16,12 +16,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/str.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "pager.h"
-#include "mapping.h"
 
 #include <wchar.h>
 #include <ctype.h>
@@ -200,7 +201,7 @@ static void format_line (FILE * f, int ismacro,
       n = COLS - col;
 
       if (ismacro >= 0) {
-        SKIPWS (t3);
+        t3 = vskipspaces(t3);
 
         /* FIXME: this is completely wrong */
         if ((n = m_strlen(t3)) > COLS - col) {