Backed out changeset 23c7b469ff20

This requires more thought: if the user has -- in $sendmail,
we need to add our arguments for 8BITMIME/DSN/etc. before it
and not after. See #3168.

diff --git a/ChangeLog b/ChangeLog
index 689431e05eccdb262b9ea263dfdf5dd98a2da3bc..342a6cd0bb44a73658f001f8a490aca52c58e5e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,3 @@
-2009-04-02 12:57 +0200  Rocco Rutte  <pdmef@gmx.net>  (bfb12cf02417)
-
-       * init.h: Clarify what $attach_charset does, closes #3165.
-
-2009-04-02 11:49 +0200  Rocco Rutte  <pdmef@gmx.net>  (1759a509dd0a)
-
-       * ChangeLog, doc/Makefile.am: Add 'sortcheck' target to
-       doc/Makefile.am
-
-       This should be used from time to time to check if vars are sorted.
-
-       Closes #3191.
-
 2009-04-02 11:47 +0200  Rocco Rutte  <pdmef@gmx.net>  (e8cdc049cf84)
 
        * init.h: Sort $pgp_* and $crypt_* vars, see #3191.

diff --git a/init.h b/init.h
index be0bb00a1216bd88a50763ebeb0ad3b55ef87aef..cfb451f8d5e4b5d2a4e17c6fa059b6b87097fc90 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2427,8 +2427,7 @@ struct option_t MuttVars[] = {
   ** .pp
   ** Specifies the program and arguments used to deliver mail sent by Mutt.
   ** Mutt expects that the specified program interprets additional
-  ** arguments as recipient addresses. Mutt appends all recipients after
-  ** adding \fC--\fP as delimiter (if not already present).
+  ** arguments as recipient addresses.
   */
   { "sendmail_wait",   DT_NUM,  R_NONE, UL &SendmailWait, 0 },
   /*

diff --git a/sendlib.c b/sendlib.c
index 3cb9feabfc49d4053cb64160c2533cd86b55f1ff..1c9c352d4cfc47bde6c173aa86778210cda6c31d 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2206,11 +2206,7 @@ mutt_invoke_sendmail (ADDRESS *from,     /* the sender */
     args = add_option (args, &argslen, &argsmax, "-R");
     args = add_option (args, &argslen, &argsmax, DsnReturn);
   }
-  if (strstr (args, "--") == NULL)
-  {
-    /* Only append "--" if not already present. */
-    args = add_option (args, &argslen, &argsmax, "--");
-  }
+  args = add_option (args, &argslen, &argsmax, "--");
   args = add_args (args, &argslen, &argsmax, to);
   args = add_args (args, &argslen, &argsmax, cc);
   args = add_args (args, &argslen, &argsmax, bcc);