[Emacs-diffs] Changes to emacs/lisp/mail/rmailout.el

[Eli Zaretskii]

Index: emacs/lisp/mail/rmailout.el
diff -u emacs/lisp/mail/rmailout.el:1.71 emacs/lisp/mail/rmailout.el:1.72
--- emacs/lisp/mail/rmailout.el:1.71    Fri Nov  4 14:51:08 2005
+++ emacs/lisp/mail/rmailout.el Sat Jan 21 13:16:05 2006
@@ -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.)