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

diff --git a/test/forw/test-forw-format b/test/forw/test-forw-format
index c3e7600..e87ce2f 100755 (executable)
--- 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 (file)
--- 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 (file)
--- 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" : "");
     }