Mercurial > emacs

diff lisp/mail/rmailout.el @ 90286:5b7d410e31f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 4-14) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (base, patch 1-7) - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187 - Update from CVS - Merge from emacs--devo--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187) - Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 25 Jan 2006 07:10:04 +0000
parents 7beb78bc1f8e 232a4bf5f26f
children c5406394f567
line wrap: on
line diff
--- a/lisp/mail/rmailout.el	Tue Jan 24 02:01:42 2006 +0000
+++ b/lisp/mail/rmailout.el	Wed Jan 25 07:10:04 2006 +0000
@@ -349,9 +349,11 @@
 						 (mail-fetch-field "sender")
 						 "unknown"))
 		    " " (current-time-string) "\n"))
-	  (if mime-version
-	      (insert "MIME-Version: " mime-version
-		      "\nContent-type: " content-type "\n"))
+	  (when mime-version
+	    (insert "MIME-Version: " mime-version)
+	    ;; Some malformed MIME messages set content-type to nil.
+	    (when content-type
+	      (insert "\nContent-type: " content-type "\n")))
 	  ;; ``Quote'' "\nFrom " as "\n>From "
 	  ;;  (note that this isn't really quoting, as there is no requirement
 	  ;;   that "\n[>]+From " be quoted in the same transparent way.)