X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=c0b22525a10cee5570dbde8efa28aeb1c503233b;hp=249882e1ef9924bcd98513a67310e2cf870c22b9;hb=c8102caaf1221828c06752f9ac69271fb999c145;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/help.c b/help.c
index 249882e..c0b2252 100644
--- a/help.c
+++ b/help.c
@@ -14,13 +14,15 @@
 #endif
 
 #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>
@@ -172,7 +174,7 @@ static void format_line (FILE * f, int ismacro,
   }
 
   if (ismacro > 0) {
-    if (!str_cmp (Pager, "builtin"))
+    if (!m_strcmp(Pager, "builtin"))
       fputs ("_\010", f);
     fputs ("M ", f);
     col += 2;
@@ -199,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) {
@@ -213,7 +215,7 @@ static void format_line (FILE * f, int ismacro,
       print_macro (f, n, &t3);
 
       if (*t3) {
-        if (str_cmp (Pager, "builtin")) {
+        if (m_strcmp(Pager, "builtin")) {
           fputc ('\n', f);
           n = 0;
         }