X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=2f135779098a0ff3e57e1d3def26d8eed4bc2182;hp=0cc3b74e240037e072c19c9eb32d2810815960e8;hb=b21e95b6f27174909ff28e8e95c13bec01e87f28;hpb=96d53ff49c308769efbf708e1e65819077cb7af6

diff --git a/help.c b/help.c
index 0cc3b74..2f13577 100644
--- a/help.c
+++ b/help.c
@@ -13,7 +13,7 @@
 # include "config.h"
 #endif
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/str.h"
 
 #include "mutt.h"
@@ -22,6 +22,7 @@
 #include "pager.h"
 #include "mapping.h"
 
+#include <wchar.h>
 #include <ctype.h>
 #include <string.h>
 
@@ -71,7 +72,7 @@ char *mutt_compile_help (char *buf, size_t buflen, int menu,
       buflen -= 2;
     }
     mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
-    len = mutt_strlen (pbuf);
+    len = str_len (pbuf);
     pbuf += len;
     buflen -= len;
   }
@@ -84,7 +85,7 @@ static int print_macro (FILE * f, int maxwidth, const char **macro)
   wchar_t wc;
   int w;
   size_t k;
-  size_t len = mutt_strlen (*macro);
+  size_t len = str_len (*macro);
   mbstate_t mbstate1, mbstate2;
 
   memset (&mbstate1, 0, sizeof (mbstate1));
@@ -167,18 +168,18 @@ static void format_line (FILE * f, int ismacro,
   else {
     col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
     col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
-    col = pad (f, mutt_strlen (t1), col_a);
+    col = pad (f, str_len (t1), col_a);
   }
 
   if (ismacro > 0) {
-    if (!mutt_strcmp (Pager, "builtin"))
+    if (!str_cmp (Pager, "builtin"))
       fputs ("_\010", f);
     fputs ("M ", f);
     col += 2;
 
     if (!split) {
       col += print_macro (f, col_b - col - 4, &t2);
-      if (mutt_strlen (t2) > col_b - col)
+      if (str_len (t2) > col_b - col)
         t2 = "...";
     }
   }
@@ -201,7 +202,7 @@ static void format_line (FILE * f, int ismacro,
         SKIPWS (t3);
 
         /* FIXME: this is completely wrong */
-        if ((n = mutt_strlen (t3)) > COLS - col) {
+        if ((n = str_len (t3)) > COLS - col) {
           n = COLS - col;
           for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
           if (col_a)
@@ -212,7 +213,7 @@ static void format_line (FILE * f, int ismacro,
       print_macro (f, n, &t3);
 
       if (*t3) {
-        if (mutt_strcmp (Pager, "builtin")) {
+        if (str_cmp (Pager, "builtin")) {
           fputc ('\n', f);
           n = 0;
         }
@@ -281,7 +282,7 @@ void mutt_help (int menu)
 {
   char t[_POSIX_PATH_MAX];
   char buf[SHORT_STRING];
-  char *desc;
+  const char *desc;
   FILE *f;
   struct binding_t *funcs;