changeset 68316:232a4bf5f26f

(rmail-output): Don't use content-type if it is nil.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 21 Jan 2006 13:16:05 +0000
parents 3bbaff5d6860
children c8609ef9d0c3
files lisp/mail/rmailout.el
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mail/rmailout.el	Sat Jan 21 13:11:21 2006 +0000
+++ b/lisp/mail/rmailout.el	Sat Jan 21 13:16:05 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.)