X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=ea694c337c204fce88d5f09d6fa4ddd4a5655dfb;hp=bce7b3d48d27328cba84411de3137d644423a8cc;hb=582001289fe5954d2a7262bf60c0dbf241e8b91a;hpb=785bb3cb4dd83ec1071998a64af74e333d076347

diff --git a/help.c b/help.c
index bce7b3d..ea694c3 100644
--- a/help.c
+++ b/help.c
@@ -140,8 +140,8 @@ static int pad (FILE * f, int col, int i)
   return (col + 1);
 }
 
-static void format_line (FILE * f, int ismacro,
-                         const char *t1, const char *t2, const char *t3)
+static void help_format_line (FILE * f, int ismacro,
+                              const char *t1, const char *t2, const char *t3)
 {
   int col;
   int col_a, col_b;
@@ -227,13 +227,13 @@ static void dump_menu (FILE * f, int menu)
 
       if (map->op == OP_MACRO) {
         if (map->descr == NULL)
-          format_line (f, -1, buf, "macro", map->macro);
+          help_format_line (f, -1, buf, "macro", map->macro);
         else
-          format_line (f, 1, buf, map->macro, map->descr);
+          help_format_line (f, 1, buf, map->macro, map->descr);
       }
       else {
         b = help_lookupFunction (map->op, menu);
-        format_line (f, 0, buf, b ? b->name : "UNKNOWN",
+        help_format_line (f, 0, buf, b ? b->name : "UNKNOWN",
                      b ? _(HelpStrings[b->op]) :
                      _("ERROR: please report this bug"));
       }
@@ -258,7 +258,7 @@ static void dump_unbound (FILE * f,
   for (i = 0; funcs[i].name; i++) {
     if (!is_bound (map, funcs[i].op) &&
         (!aux || !is_bound (aux, funcs[i].op)))
-      format_line (f, 0, funcs[i].name, "", _(HelpStrings[funcs[i].op]));
+      help_format_line (f, 0, funcs[i].name, "", _(HelpStrings[funcs[i].op]));
   }
 }
 
@@ -302,3 +302,5 @@ void mutt_help (int menu)
                         M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
                         NULL) == OP_REFORMAT_WINCH);
 }
+
+#undef HELP_C