projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble
[apps/madmutt.git]
/
help.c
diff --git
a/help.c
b/help.c
index
d5182ca
..
d54d1ed
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];
@@
-140,8
+140,8
@@
static int pad (FILE * f, int col, int i)
return (col + 1);
}
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;
{
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)
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
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);
}
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"));
}
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)))
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]));
}
}
}
}
@@
-276,7
+276,7
@@
void mutt_help (int menu)
desc = _("<UNKNOWN>");
do {
desc = _("<UNKNOWN>");
do {
- f = m_tempfile(tmp, sizeof(tmp), NONULL(
MC
ore.tmpdir), NULL);
+ f = m_tempfile(tmp, sizeof(tmp), NONULL(
mod_c
ore.tmpdir), NULL);
if (!f) {
mutt_perror(tmp);
return;
if (!f) {
mutt_perror(tmp);
return;
@@
-302,3
+302,5
@@
void mutt_help (int menu)
M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
NULL) == OP_REFORMAT_WINCH);
}
M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
NULL) == OP_REFORMAT_WINCH);
}
+
+#undef HELP_C