return (NULL);
}
-void mutt_make_help (char *d, ssize_t dlen, char *txt, int menu, int op)
+void mutt_make_help (char *d, ssize_t dlen, const char *txt, int menu, int op)
{
char buf[STRING];
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;
}
if (ismacro > 0) {
- if (!m_strcmp(Pager, "builtin"))
- fputs ("_\010", f);
- fputs ("M ", f);
+ fputs ("_\010M ", f);
col += 2;
if (!split) {
print_macro (f, n, &t3);
if (*t3) {
- if (m_strcmp(Pager, "builtin")) {
- fputc ('\n', f);
- n = 0;
- }
- else {
- n += col - COLS;
- if (option (OPTMARKERS))
- ++n;
- }
+ n += col - COLS;
+ if (option (OPTMARKERS))
+ ++n;
col = pad (f, n, col_b);
}
}
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"));
}
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]));
}
}
desc = _("<UNKNOWN>");
do {
- f = m_tempfile(tmp, sizeof(tmp), NONULL(MCore.tmpdir), NULL);
+ f = m_tempfile(tmp, sizeof(tmp), NONULL(mod_core.tmpdir), NULL);
if (!f) {
mutt_perror(tmp);
return;
m_fclose(&f);
snprintf(buf, sizeof (buf), _("Help for %s"), desc);
- } while (mutt_do_pager(buf, tmp,
- M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
- NULL) == OP_REFORMAT_WINCH);
+ } while (mutt_pager(buf, tmp,
+ M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
+ NULL) == OP_REFORMAT_WINCH);
}
+
+#undef HELP_C