projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I'm tired of that. madmutt needs a glibc, so what...
[apps/madmutt.git]
/
help.c
diff --git
a/help.c
b/help.c
index
1162b23
..
bce7b3d
100644
(file)
--- a/
help.c
+++ b/
help.c
@@
-39,7
+39,7
@@
static struct binding_t *help_lookupFunction (int op, int menu)
return (NULL);
}
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, c
onst c
har *txt, int menu, int op)
{
char buf[STRING];
{
char buf[STRING];
@@
-164,9
+164,7
@@
static void format_line (FILE * f, int ismacro,
}
if (ismacro > 0) {
}
if (ismacro > 0) {
- if (!m_strcmp(Pager, "builtin"))
- fputs ("_\010", f);
- fputs ("M ", f);
+ fputs ("_\010M ", f);
col += 2;
if (!split) {
col += 2;
if (!split) {
@@
-205,15
+203,9
@@
static void format_line (FILE * f, int ismacro,
print_macro (f, n, &t3);
if (*t3) {
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);
}
}
col = pad (f, n, col_b);
}
}
@@
-284,7
+276,7
@@
void mutt_help (int menu)
desc = _("<UNKNOWN>");
do {
desc = _("<UNKNOWN>");
do {
- f = m_tempfile(tmp, sizeof(tmp), NONULL(
Te
mpdir), NULL);
+ f = m_tempfile(tmp, sizeof(tmp), NONULL(
MCore.t
mpdir), NULL);
if (!f) {
mutt_perror(tmp);
return;
if (!f) {
mutt_perror(tmp);
return;
@@
-306,7
+298,7
@@
void mutt_help (int menu)
m_fclose(&f);
snprintf(buf, sizeof (buf), _("Help for %s"), desc);
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);
}
}