[SCM] GNU Mailutils branch, master, updated. release-2.2-804-gb4c787e

[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=b4c787e6ea89ba0005845925cc33070a264d2a77

The branch, master has been updated
       via  b4c787e6ea89ba0005845925cc33070a264d2a77 (commit)
       via  fd11c9136b9d862fa788ecb747cf5d1e9413a869 (commit)
      from  2ffea3b6973afdfc0972e33ba99a1faa9c4165de (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 b4c787e6ea89ba0005845925cc33070a264d2a77
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 1 12:29:46 2016 +0200

    Fix in logstream
    
    * libmailutils/stream/logstream.c (_log_write): Force MU_LOG_LOCUS
    mode if the locus is given explicitly.

commit fd11c9136b9d862fa788ecb747cf5d1e9413a869
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 1 12:27:20 2016 +0200

    Bugfixes in MH
    
    * mh/mh_getopt.c (mh_opt_notimpl_warning): For boolean options,
    don't emit warning if the value would be set to false.
    * mh/anno.c: Fix the type of boolean unimplemented options.
    * mh/refile.c: Likewise.
    * mh/repl.c: Likewise.
    * mh/send.c: Likewise.

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

Summary of changes:
 libmailutils/stream/logstream.c |    3 +++
 mh/anno.c                       |    2 +-
 mh/mh_getopt.c                  |    6 ++++++
 mh/refile.c                     |    2 +-
 mh/repl.c                       |    6 +++---
 mh/send.c                       |    8 ++++----
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/libmailutils/stream/logstream.c b/libmailutils/stream/logstream.c
index d3893e0..019ba83 100644
--- a/libmailutils/stream/logstream.c
+++ b/libmailutils/stream/logstream.c
@@ -168,12 +168,14 @@ _log_write (struct _mu_stream *str, const char *buf, 
size_t size,
          /* Input line (decimal) */
          READNUM (n);
          _locus_set_line (&loc, n);
+         logmode |= MU_LOGMODE_LOCUS;
          break;
 
        case 'c':
          /* Column in input line (decimal) */
          READNUM (n);
          _locus_set_col (&loc, n);
+         logmode |= MU_LOGMODE_LOCUS;
          break;
          
        case 'f':
@@ -182,6 +184,7 @@ _log_write (struct _mu_stream *str, const char *buf, size_t 
size,
          fname = buf;
          buf += flen;
          size -= flen;
+         logmode |= MU_LOGMODE_LOCUS;
          break;
 
        default:
diff --git a/mh/anno.c b/mh/anno.c
index 604b9be..dab8bd2 100644
--- a/mh/anno.c
+++ b/mh/anno.c
@@ -30,7 +30,7 @@ static char *anno_text;   /* header field value */
 static struct mu_option options[] = {
   { "inplace", 0, NULL, MU_OPTION_HIDDEN,
     N_("annotate the message in place"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_bool, NULL, mh_opt_notimpl_warning },
   { "date", 0, NULL, MU_OPTION_DEFAULT,
     N_("add FIELD: date header"),
     mu_c_bool, &anno_date },
diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c
index 08c9001..0e7ec3c 100644
--- a/mh/mh_getopt.c
+++ b/mh/mh_getopt.c
@@ -293,6 +293,12 @@ void
 mh_opt_notimpl_warning (struct mu_parseopt *po, struct mu_option *opt,
                        char const *arg)
 {
+  if (opt->opt_type == mu_c_bool)
+    {
+      int val;
+      if (mu_str_to_c (arg, opt->opt_type, &val, NULL) == 0 && !val)
+       return;
+    }
   mu_error (_("ignoring not implemented option %s"), opt->opt_long);
 }
 
diff --git a/mh/refile.c b/mh/refile.c
index 8c7747d..32ed443 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -63,7 +63,7 @@ static struct mu_option options[] = {
   { "link",    0, NULL, MU_OPTION_ALIAS },
   { "preserve", 0, NULL, MU_OPTION_HIDDEN,
     N_("try to preserve message sequence numbers"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_bool, NULL, mh_opt_notimpl_warning },
   { "source", 0, N_("FOLDER"), MU_OPTION_DEFAULT,
     N_("specify source folder; it will become the current folder after the 
program exits"),
     mu_c_string, NULL, mh_opt_set_folder },
diff --git a/mh/repl.c b/mh/repl.c
index fefa6a2..2d27ab5 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -129,7 +129,7 @@ static struct mu_option options[] = {
     mu_c_string, NULL, clr_cc },
   { "group", 0,  NULL, MU_OPTION_DEFAULT,
     N_("construct a group or followup reply"),
-    mu_c_string, NULL, set_group },
+    mu_c_bool, NULL, set_group },
   { "editor", 0, N_("PROG"), MU_OPTION_DEFAULT,
     N_("set the editor program to use"),
     mu_c_string, &wh_env.editor },
@@ -153,10 +153,10 @@ static struct mu_option options[] = {
     mu_c_string, &mhl_filter, mh_opt_clear_string },
   { "inplace",  0, NULL,   MU_OPTION_HIDDEN,
     N_("annotate the message in place"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_bool, NULL, mh_opt_notimpl_warning },
   { "query",    0, NULL,   MU_OPTION_HIDDEN,
     N_("query for addresses to place in To: and Cc: lists"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_bool, NULL, mh_opt_notimpl_warning },
   { "width",    0, N_("NUMBER"), MU_OPTION_DEFAULT,
     N_("set output width"),
     mu_c_int, &width },
diff --git a/mh/send.c b/mh/send.c
index 260b5c8..99dd570 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -118,14 +118,14 @@ static struct mu_option options[] = {
     mu_c_string, NULL, mh_opt_notimpl },
   { "nofilter",      0, NULL, MU_OPTION_HIDDEN,
     N_("undo the effect of the last --filter option"),
-    mu_c_string, NULL, mh_opt_notimpl },
+    mu_c_int, NULL, mh_opt_notimpl },
   { "format",        0, NULL, MU_OPTION_HIDDEN,
     N_("reformat To: and Cc: addresses"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_bool, NULL, mh_opt_notimpl_warning },
   { "noformat",      0, NULL, MU_OPTION_HIDDEN },
   { "forward",       0, NULL, MU_OPTION_HIDDEN,
     N_("in case of failure forward the draft along with the failure notice to 
the sender"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_bool, NULL, mh_opt_notimpl_warning },
   { "noforward",     0, NULL, MU_OPTION_HIDDEN, "" },
   { "mime",          0, NULL, MU_OPTION_HIDDEN,
     N_("use MIME encapsulation"),
@@ -154,7 +154,7 @@ static struct mu_option options[] = {
     mu_c_bool, &watch },
   { "width",         0, N_("NUMBER"), MU_OPTION_HIDDEN,
     N_("make header fields no longer than NUMBER columns"),
-    mu_c_string, NULL, mh_opt_notimpl_warning },
+    mu_c_uint, NULL, mh_opt_notimpl_warning },
 
   MU_OPTION_END
 };


hooks/post-receive
-- 
GNU Mailutils