[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 2def1ef7c06766912f6eea1a9ab31b492d82173a

[David Levine]

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 "The nmh Mail Handling System".

The branch, master has been updated
       via  2def1ef7c06766912f6eea1a9ab31b492d82173a (commit)
       via  56f140c6607d7a390639bd8535175a841a0fba62 (commit)
      from  e22a2c8b3665531be1203a59de768c909f52c7c6 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=2def1ef7c06766912f6eea1a9ab31b492d82173a


commit 2def1ef7c06766912f6eea1a9ab31b492d82173a
Merge: 56f140c e22a2c8
Author: David Levine <address@hidden>
Date:   Mon Feb 27 21:12:22 2012 -0600

    Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh


http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=56f140c6607d7a390639bd8535175a841a0fba62


commit 56f140c6607d7a390639bd8535175a841a0fba62
Author: David Levine <address@hidden>
Date:   Mon Feb 27 21:10:47 2012 -0600

    Removed blank line after "End of Forwarded Message" lines.  It's
    always bothered me.

diff --git a/test/forw/test-forw-format b/test/forw/test-forw-format
index c3e7600..e87ce2f 100755
--- a/test/forw/test-forw-format
+++ b/test/forw/test-forw-format
@@ -62,7 +62,6 @@ cat `mhpath +inbox 1` >> "$expected"
 cat >> "$expected" <<EOF
 
 ------- End of Forwarded Message
-
 EOF
 
 forw -editor true -form "${form}" -from "${from}" -to "${to1}" -to "${to2}" \
diff --git a/uip/forw.c b/uip/forw.c
index 22ecc00..2d56e6b 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -659,7 +659,7 @@ copy_draft (int out, char *digest, char *file, int volume, 
int issue, int dashst
     if (digest) {
        strncpy (buffer, delim4, sizeof(buffer));
     } else {
-       snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded 
Message%s\n\n",
+       snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded 
Message%s\n",
                mp->numsel > 1 ? "s" : "");
     }
     write (out, buffer, strlen (buffer));
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 6bfbade..68cb7f9 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -484,7 +484,7 @@ mhl (int argc, char **argv)
            printf ("%s", buf);
        }
        else
-           printf ("\n------- End of Forwarded Message%s\n\n",
+           printf ("\n------- End of Forwarded Message%s\n",
                    vecp > 1 ? "s" : "");
     }
 

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

Summary of changes:
 test/forw/test-forw-format |    1 -
 uip/forw.c                 |    2 +-
 uip/mhlsbr.c               |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System