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[SHORT_STRING];
+ char buf[STRING];
if (km_expand_key (buf, sizeof (buf), km_find_func (menu, op)) ||
km_expand_key (buf, sizeof (buf), km_find_func (MENU_GENERIC, op)))
}
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);
}
}
{
struct keymap_t *map;
struct binding_t *b;
- char buf[SHORT_STRING];
+ char buf[STRING];
/* browse through the keymap table */
for (map = Keymaps[menu]; map; map = map->next) {
void mutt_help (int menu)
{
char tmp[_POSIX_PATH_MAX];
- char buf[SHORT_STRING];
+ char buf[STRING];
const char *desc;
FILE *f;
struct binding_t *funcs;
desc = _("<UNKNOWN>");
do {
- f = m_tempfile(tmp, sizeof(tmp), NONULL(Tempdir), NULL);
+ f = m_tempfile(tmp, sizeof(tmp), NONULL(MCore.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);
}