summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-12-08 00:34:06 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-12-08 00:34:06 +0000
commite7a6f1b394927aca592c4183e9ec2b7cd0656555 (patch)
tree75b04faf161db4b1397e3895827bbc8e9126eb7c
parent0c2ca624cd4d49fc22dba7dcfe8af5c93f003917 (diff)
downloadmailutils-e7a6f1b394927aca592c4183e9ec2b7cd0656555.tar.gz
mailutils-e7a6f1b394927aca592c4183e9ec2b7cd0656555.tar.bz2
Make sure -nodraftfolder cancels Draft-Folder variable, not only -draftfolder option.
-rw-r--r--mh/comp.c9
-rw-r--r--mh/forw.c9
-rw-r--r--mh/repl.c10
3 files changed, 16 insertions, 12 deletions
diff --git a/mh/comp.c b/mh/comp.c
index ff83e5f12..554ad3e16 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -86,6 +86,11 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
{
switch (key)
{
+ case ARGP_KEY_INIT:
+ wh_env.draftfolder = mh_global_profile_get ("Draft-Folder",
+ mu_folder_directory ());
+ break;
+
case ARG_BUILD:
build_only = 1;
break;
@@ -209,10 +214,6 @@ main (int argc, char **argv)
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
opt_handler, NULL, &index);
- if (!wh_env.draftfolder)
- wh_env.draftfolder = mh_global_profile_get ("Draft-Folder",
- mu_folder_directory ());
-
wh_env.file = mh_expand_name (wh_env.draftfolder, "comp", 0);
if (!wh_env.draftfile)
wh_env.draftfile = mh_expand_name (wh_env.draftfolder, "draft", 0);
diff --git a/mh/forw.c b/mh/forw.c
index e881a3d00..09881d5f5 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -121,6 +121,11 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
{
switch (key)
{
+ case ARGP_KEY_INIT:
+ wh_env.draftfolder = mh_global_profile_get ("Draft-Folder",
+ mu_folder_directory ());
+ break;
+
case ARG_ANNOTATE:
annotate = is_true (arg);
break;
@@ -427,10 +432,6 @@ main (int argc, char **argv)
mbox = mh_open_folder (current_folder, 0);
mh_msgset_parse (mbox, &msgset, argc, argv, "cur");
- if (!wh_env.draftfolder)
- wh_env.draftfolder = mh_global_profile_get ("Draft-Folder",
- mu_folder_directory ());
-
wh_env.file = mh_expand_name (wh_env.draftfolder, "forw", 0);
if (!wh_env.draftfile)
wh_env.draftfile = mh_expand_name (wh_env.draftfolder, "draft", 0);
diff --git a/mh/repl.c b/mh/repl.c
index 61ac4ab3d..ee54cfe63 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -142,6 +142,11 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
switch (key)
{
+ case ARGP_KEY_INIT:
+ wh_env.draftfolder = mh_global_profile_get ("Draft-Folder",
+ mu_folder_directory ());
+ break;
+
case ARG_ANNOTATE:
annotate = is_true (arg);
break;
@@ -376,6 +381,7 @@ main (int argc, char **argv)
mu_init_nls ();
mu_argp_init (program_version, NULL);
+
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
opt_handler, NULL, &index);
if (mh_format_parse (format_str, &format))
@@ -384,10 +390,6 @@ main (int argc, char **argv)
exit (1);
}
- if (!wh_env.draftfolder)
- wh_env.draftfolder = mh_global_profile_get ("Draft-Folder",
- mu_folder_directory ());
-
mbox = mh_open_folder (current_folder, 0);
mh_msgset_parse (mbox, &msgset, argc - index, argv + index, "cur");
if (msgset.count != 1)

Return to:

Send suggestions and report system problems to the System administrator.