[SCM] GNU Mailutils branch, master, updated. release-2.2-786-gfa7ac60

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

The branch, master has been updated
       via  fa7ac6058b528897684ec2eed9f396da159d856d (commit)
       via  f52ed2c7d8e5baa10f04fad38b8d7da1b987da52 (commit)
      from  3619df585404004c8c695268c8da611ef95d9800 (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 fa7ac6058b528897684ec2eed9f396da159d856d
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Oct 20 08:11:34 2016 +0300

    Minor fix in wordwrapper stream
    
    * libmailutils/stream/wordwrap.c (set_margin): Flush the stream
    if the new margin equals the current offset.
    (_wordwrap_write): Fix conditional

commit f52ed2c7d8e5baa10f04fad38b8d7da1b987da52
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Oct 20 07:54:02 2016 +0300

    Minor fix
    
    * mu/ldflags.c: Ignore "cfg" and "argp" keywords.

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

Summary of changes:
 libmailutils/stream/wordwrap.c |   28 +++++++++++++++-------------
 mu/ldflags.c                   |    6 +++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/libmailutils/stream/wordwrap.c b/libmailutils/stream/wordwrap.c
index 789966e..fce3359 100644
--- a/libmailutils/stream/wordwrap.c
+++ b/libmailutils/stream/wordwrap.c
@@ -132,7 +132,8 @@ _wordwrap_write (mu_stream_t stream, const char *iptr, 
size_t isize,
   for (n = 0; n < isize; n++)
     {
       if (str->offset == str->right_margin
-         || (str->offset > 0 && str->buffer[str->offset - 1] == '\n'))
+         || (str->offset > str->left_margin
+             && str->buffer[str->offset - 1] == '\n'))
        _wordwrap_flush_line (str, iptr[n]);
       if (str->offset == str->left_margin && mu_isblank (iptr[n]))
        continue;
@@ -178,19 +179,20 @@ set_margin (mu_stream_t stream, unsigned lmargin, int off)
   if (lmargin >= str->right_margin)
     return EINVAL;
 
+  /* Flush the stream if the new margin is set to the left of the current
+     column, or it equals the current column and the character in previous
+     column is a word constituent, or the last character on line is a newline.
+  */
   if (str->offset > str->left_margin
-      && (lmargin < str->offset || str->buffer[str->offset - 1] == '\n'))
-    {
-      str->left_margin = lmargin;
-      _wordwrap_flush (stream);
-    }
-  else
-    {
-      if (lmargin > str->offset)
-       memset (str->buffer + str->offset, ' ', lmargin - str->offset);
-      str->left_margin = lmargin;
-      str->offset = lmargin;
-    }
+      && (lmargin < str->offset
+         || (lmargin == str->offset && is_word (str->buffer[str->offset - 1]))
+         || str->buffer[str->offset - 1] == '\n'))
+    _wordwrap_flush (stream);
+
+  if (lmargin > str->offset)
+    memset (str->buffer + str->offset, ' ', lmargin - str->offset);
+  str->left_margin = lmargin;
+  str->offset = lmargin;
 
   return 0;
 }
diff --git a/mu/ldflags.c b/mu/ldflags.c
index 7f52bf2..9559cce 100644
--- a/mu/ldflags.c
+++ b/mu/ldflags.c
@@ -65,8 +65,8 @@ struct lib_descr {
 #ifdef WITH_PYTHON
   { "python", "-lmu_py " PYTHON_LIBS, -1, NOTALL },
 #endif
-  { "cfg",    "-lmu_cfg",  -1, NOTALL },
-  { "argp",   "-lmu_argp", -2, NOTALL },
+  { "cfg",    NULL,  0, 0 },  /* deprecated */
+  { "argp",   NULL,  0, 0 },  /* deprecated */
   { NULL }
 };
 
@@ -100,7 +100,7 @@ add_entry (int level, char *ptr)
 
 /* Sort the entries by their level. */
 void
-sort_entries ()
+sort_entries (void)
 {
   int j;
 


hooks/post-receive
-- 
GNU Mailutils