Make -attach Nmh-Attachment & -attachformat 1 the default.

[nmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 22ecc004237b0fdde2515094fad0ff85c09a4f08..acf74c43ab403ed9f8969645200f4b89a416d138 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -130,7 +130,7 @@ main (int argc, char **argv)
     int msgp = 0, anot = 0, inplace = 1, mime = 0;
     int issue = 0, volume = 0, dashstuff = 0;
     int nedit = 0, nwhat = 0, i, in;
-    int out, isdf = 0, msgnum;
+    int out, isdf = 0, msgnum = 0;
     int outputlinelen = OUTPUTLINELEN;
     int dat[5];
     char *cp, *cwd, *maildir, *dfolder = NULL;
@@ -441,7 +441,7 @@ try_it_again:
        form = forwcomps;
     }
 
-    dat[0] = issue;
+    dat[0] = digest ? issue : msgnum;
     dat[1] = volume;
     dat[2] = 0;
     dat[3] = outputlinelen;
@@ -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));