Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 0df6111f 0df6111f471121969ce508a994f0d6e942580d1f by Sergey Poznyakoff
Options

New option --format.

1 parent 9360c140
Inline Side-by-side
Showing 1 changed file with 14 additions and 1 deletions
...@@ -51,10 +51,12 @@ static struct argp_option options[] = { ...@@ -51,10 +51,12 @@ static struct argp_option options[] = {
51 {"filter", ARG_FILTER, N_("MHL-FILTER"), 0, 51 {"filter", ARG_FILTER, N_("MHL-FILTER"), 0,
52 N_("Set the mhl filter to preprocess the body of the message being replied")}, 52 N_("Set the mhl filter to preprocess the body of the message being replied")},
53 {"form", ARG_FORM, N_("FILE"), 0, N_("Read format from given file")}, 53 {"form", ARG_FORM, N_("FILE"), 0, N_("Read format from given file")},
54 {"format", ARG_FORMAT, N_("BOOL"), OPTION_ARG_OPTIONAL,
55 N_("Include a copy of the message being replied. The message will be processed either using the default filter \"mhl.reply\", or using the filter specified by --filter option.") },
54 {"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL, 56 {"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL,
55 N_("* Annotate the message in place")}, 57 N_("* Annotate the message in place")},
56 {"query", ARG_QUERY, N_("BOOL"), OPTION_ARG_OPTIONAL, 58 {"query", ARG_QUERY, N_("BOOL"), OPTION_ARG_OPTIONAL,
57 N_("* Query for addresses to place in To: and Cc: lists")}, 59 N_("Query for addresses to place in To: and Cc: lists")},
58 {"width", ARG_WIDTH, N_("NUMBER"), 0, N_("Set output width")}, 60 {"width", ARG_WIDTH, N_("NUMBER"), 0, N_("Set output width")},
59 {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0, 61 {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
60 N_("* Set the replacement for whatnow program")}, 62 N_("* Set the replacement for whatnow program")},
...@@ -81,6 +83,7 @@ struct mh_option mh_option[] = { ...@@ -81,6 +83,7 @@ struct mh_option mh_option[] = {
81 {"noedit", 3, }, 83 {"noedit", 3, },
82 {"fcc", 1, MH_OPT_ARG, "folder"}, 84 {"fcc", 1, MH_OPT_ARG, "folder"},
83 {"filter", 2, MH_OPT_ARG, "program"}, 85 {"filter", 2, MH_OPT_ARG, "program"},
86 {"format", 2, MH_OPT_BOOL },
84 {"inplace", 1, MH_OPT_BOOL }, 87 {"inplace", 1, MH_OPT_BOOL },
85 {"query", 1, MH_OPT_BOOL }, 88 {"query", 1, MH_OPT_BOOL },
86 {"whatnowproc", 2, MH_OPT_ARG, "program"}, 89 {"whatnowproc", 2, MH_OPT_ARG, "program"},
...@@ -194,6 +197,16 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -194,6 +197,16 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
194 mhl_filter = arg; 197 mhl_filter = arg;
195 break; 198 break;
196 199
200 case ARG_FORMAT:
201 if (is_true (arg))
202 {
203 if (!mhl_filter)
204 mhl_filter = mh_expand_name (MHLIBDIR, "mhl.repl", 0);
205 }
206 else
207 mhl_filter = NULL;
208 break;
209
197 case ARG_ANNOTATE: 210 case ARG_ANNOTATE:
198 case ARG_FCC: 211 case ARG_FCC:
199 case ARG_INPLACE: 212 case ARG_INPLACE:
......