diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-12-08 00:34:06 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-12-08 00:34:06 +0000 |
commit | e7a6f1b394927aca592c4183e9ec2b7cd0656555 (patch) | |
tree | 75b04faf161db4b1397e3895827bbc8e9126eb7c /mh/repl.c | |
parent | 0c2ca624cd4d49fc22dba7dcfe8af5c93f003917 (diff) | |
download | mailutils-e7a6f1b394927aca592c4183e9ec2b7cd0656555.tar.gz mailutils-e7a6f1b394927aca592c4183e9ec2b7cd0656555.tar.bz2 |
Make sure -nodraftfolder cancels Draft-Folder variable, not only -draftfolder option.
Diffstat (limited to 'mh/repl.c')
-rw-r--r-- | mh/repl.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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) |