[SCM] GNU Mailutils branch, master, updated. rel-2_1-83-gd6d78fa

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=d6d78fad1073dc4b1da28696a5aec01b6460ad29

The branch, master has been updated
       via  d6d78fad1073dc4b1da28696a5aec01b6460ad29 (commit)
       via  ae130d52fd03ccc49e1df6ef92ca0c841a071073 (commit)
      from  b2c1941415490c40ac146c7426d688a153f930d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d6d78fad1073dc4b1da28696a5aec01b6460ad29
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu May 13 16:54:03 2010 +0300

    MH: Improve handling of not implemented options.
    
    * mh/mh_getopt.c (mh_opt_notimpl, mh_opt_notimpl_warning): New
    functions.
    * mh/mh_getopt.h (mh_opt_notimpl, mh_opt_notimpl_warning): New
    protos.
    * mh/ali.c (doc): Remove 'not implemented' stanza.
    * mh/pick.c: Likewise.
    * mh/anno.c: Use mh_opt_notimpl and mh_opt_notimpl_warning
    for not implemented options.
    * mh/comp.c: Likewise.
    * mh/forw.c: Likewise.
    * mh/mhn.c: Likewise.
    * mh/refile.c: Likewise.
    * mh/repl.c: Likewise.
    * mh/scan.c: Likewise.
    * mh/send.c: Likewise.

commit ae130d52fd03ccc49e1df6ef92ca0c841a071073
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu May 13 16:14:51 2010 +0300

    MH: a bugfix.
    
    * mh/mh_global.c (mh_read_profile): Set MU folder directory to
    mh_get_dir.  This fixes the bug reported by Peter S Galbraith
    (Id. <address@hidden>, ref.
    
http://sourceforge.net/mailarchive/forum.php?thread_name=15904.1273699954%40mixed&forum_name=mh-e-devel)

-----------------------------------------------------------------------

Summary of changes:
 mh/ali.c       |    3 +--
 mh/anno.c      |    2 ++
 mh/comp.c      |    6 +++---
 mh/forw.c      |    9 ++++++---
 mh/mh_getopt.c |   13 +++++++++++++
 mh/mh_getopt.h |    3 +++
 mh/mh_global.c |    3 ++-
 mh/mhn.c       |    1 +
 mh/pick.c      |    3 +--
 mh/refile.c    |    1 +
 mh/repl.c      |    9 ++++++---
 mh/scan.c      |    2 +-
 mh/send.c      |   15 +++++++++++++--
 13 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/mh/ali.c b/mh/ali.c
index 851ee1a..088bd35 100644
--- a/mh/ali.c
+++ b/mh/ali.c
@@ -28,8 +28,7 @@
 
 const char *program_version = "ali (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU MH ali")"\v"
-N_("Options marked with `*' are not yet implemented.\n"
-"Use -help to obtain the list of traditional MH options.");
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("aliases ...");
 
 /* GNU options */
diff --git a/mh/anno.c b/mh/anno.c
index 83119c3..8b3319a 100644
--- a/mh/anno.c
+++ b/mh/anno.c
@@ -69,10 +69,12 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
 
     case ARG_INPLACE:
+      mh_opt_notimpl_warning ("-inplace");
       inplace = is_true (arg);
       break;
 
     case ARG_NOINPLACE:
+      mh_opt_notimpl_warning ("-noinplace");
       inplace = 0;
       break;
 
diff --git a/mh/comp.c b/mh/comp.c
index fc13db5..bcc0067 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -140,9 +140,9 @@ opt_handler (int key, char *arg, struct argp_state *state)
       
     case ARG_WHATNOWPROC:
     case ARG_NOWHATNOWPROC:
-      argp_error (state, _("option is not yet implemented"));
-      exit (1);
-      
+      mh_opt_notimpl ("-[no]whatnowproc");
+      break;
+
     case ARG_LICENSE:
       mh_license (argp_program_version);
       break;
diff --git a/mh/forw.c b/mh/forw.c
index 196c794..9597cfb 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -204,11 +204,14 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
       
     case ARG_INPLACE:
+      mh_opt_notimpl_warning ("-inplace");
+      break;
+
     case ARG_WHATNOWPROC:
     case ARG_NOWHATNOWPROC:
-      argp_error (state, _("option is not yet implemented"));
-      exit (1);
-      
+      mh_opt_notimpl ("-[no]whatnowproc");
+      break;
+ 
     case ARG_LICENSE:
       mh_license (argp_program_version);
       break;
diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c
index dbd385a..2a6c949 100644
--- a/mh/mh_getopt.c
+++ b/mh/mh_getopt.c
@@ -150,3 +150,16 @@ mh_help (struct mh_option *mh_opt, const char *doc)
             "Run %s --help for more info on these.\n"),
             mu_program_name);
 }
+
+void
+mh_opt_notimpl (const char *name)
+{
+  mu_error (_("option is not yet implemented: %s"), name);
+  exit (1);
+}
+
+void
+mh_opt_notimpl_warning (const char *name)
+{
+  mu_error (_("ignoring not implemented option %s"), name);
+}
diff --git a/mh/mh_getopt.h b/mh/mh_getopt.h
index bd26f83..b930cf3 100644
--- a/mh/mh_getopt.h
+++ b/mh/mh_getopt.h
@@ -197,3 +197,6 @@ int mh_argp_parse (int *argc, char **argv[],
 
 void mh_help (struct mh_option *mh_option, const char *doc);
 void mh_license (const char *name);
+
+void mh_opt_notimpl (const char *name);
+void mh_opt_notimpl_warning (const char *name);
diff --git a/mh/mh_global.c b/mh/mh_global.c
index 4cf567d..7b5c054 100644
--- a/mh/mh_global.c
+++ b/mh/mh_global.c
@@ -73,6 +73,8 @@ mh_read_profile ()
   profile = mh_context_create (p, 1);
   mh_context_read (profile);
 
+  mu_set_folder_directory (mh_get_dir ());
+
   mh_set_reply_regex (mh_global_profile_get ("Reply-Regex", NULL));
   fallback = mh_global_profile_get ("Decode-Fallback", NULL);
   if (fallback && mu_set_default_fallback (fallback))
@@ -88,7 +90,6 @@ _mh_init_global_context ()
   
   if (context)
     return;
-  mu_set_folder_directory (mh_get_dir ());
   p = getenv ("CONTEXT");
   if (!p)
     p = MH_CONTEXT_FILE;
diff --git a/mh/mhn.c b/mh/mhn.c
index b54d109..b764e97 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -334,6 +334,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
       /* Display options */
 
     case ARG_SERIALONLY:
+      mh_opt_notimpl_warning ("-[no]serialonly");
       if (is_true (arg))
        {
          mode_options |= OPT_SERIALONLY;
diff --git a/mh/pick.c b/mh/pick.c
index e88aec0..ecf3f8a 100644
--- a/mh/pick.c
+++ b/mh/pick.c
@@ -29,8 +29,7 @@
 
 const char *program_version = "pick (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU MH pick")"\v"
-N_("Options marked with `*' are not yet implemented.\n\
-Use -help to obtain the list of traditional MH options.");
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[messages]");
 
 /* GNU options */
diff --git a/mh/refile.c b/mh/refile.c
index 9cade4c..5bf2faa 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -168,6 +168,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
       
     case ARG_PRESERVE:
+      mh_opt_notimpl_warning ("-preserve");
       preserve_flag = is_true(arg);
       break;
        
diff --git a/mh/repl.c b/mh/repl.c
index af6b22d..73fba50 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -256,11 +256,14 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
          
     case ARG_INPLACE:
+      mh_opt_notimpl_warning ("-inplace");
+      break;
+      
     case ARG_WHATNOWPROC:
     case ARG_NOWHATNOWPROC:
-      argp_error (state, _("Option is not yet implemented"));
-      exit (1);
-      
+      mh_opt_notimpl ("-[no]whatnowproc");
+      break;
+
     case ARG_LICENSE:
       mh_license (argp_program_version);
       break;
diff --git a/mh/scan.c b/mh/scan.c
index cdffca0..36081a8 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -134,7 +134,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
       
     case ARG_FILE:
-      argp_error (state, _("Option is not yet implemented"));
+      mh_opt_notimpl ("-file");
       break;
       
     case ARG_LICENSE:
diff --git a/mh/send.c b/mh/send.c
index 8118d7f..3f92c9d 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -170,30 +170,40 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
       
     case ARG_FILTER:
+      mh_opt_notimpl ("-filter");
+      break;
+
     case ARG_NOFILTER:
-      return 1;
-      
+      mh_opt_notimpl ("-nofilter");
+      break;
+ 
     case ARG_FORMAT:
+      mh_opt_notimpl_warning ("-format"); 
       reformat_recipients = is_true (arg);
       break;
       
     case ARG_NOFORMAT:
+      mh_opt_notimpl_warning ("-noformat"); 
       reformat_recipients = 0;
       break;
       
     case ARG_FORWARD:
+      mh_opt_notimpl_warning ("-forward");
       forward_notice = is_true (arg);
       break;
       
     case ARG_NOFORWARD:
+      mh_opt_notimpl_warning ("-noforward");
       forward_notice = 0;
       break;
       
     case ARG_MIME:
+      mh_opt_notimpl_warning ("-mime");
       mime_encaps = is_true (arg);
       break;
       
     case ARG_NOMIME:
+      mh_opt_notimpl_warning ("-nomime");
       mime_encaps = 0;
       break;
       
@@ -244,6 +254,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
       
     case ARG_WIDTH:
+      mh_opt_notimpl_warning ("-width");
       width = strtoul (arg, &p, 10);
       if (*p)
        {


hooks/post-receive
-- 
GNU Mailutils