- Makefile.am: Fix the dist target to include all necessary files.

- po/fr.po: New French translation.  (-> stable!)
- Add the new options to Muttrc.in.
- regex.c, configure.in: include config.h from regex.c, and handle
  alloca in a more intelligent way than before. (Currently, we just
  mis-handle it.)
  Port this to stable and test it!
- po/cs.po: update cs.po.
- po/de.po, po/nl.po: updated versions from Roland and Boris.
- pager.c: Vikas' grok_ansi fix.
- po/Makefile.in.in: keymap_defs is always in po/..  - from Lars
  Hecking.

1 files changed, 1 insertions, 3 deletions

diff --git a/sendlib.c b/sendlib.c
index 0d722c47..9002abc7 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -1336,13 +1336,11 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
     mutt_write_mime_header (attach, fp);
   }
 
-#ifndef NO_XMAILER
-  if (mode == 0 && !privacy)
+  if (mode == 0 && !privacy && option (OPTXMAILER))
   {
     /* Add a vanity header */
     fprintf (fp, "X-Mailer: Mutt %s\n", MUTT_VERSION);
   }
-#endif
 
   /* Add any user defined headers */
   for (; tmp; tmp = tmp->next)