From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 4 Jul 2019 14:08:22 +0000 (+0200)
Subject: In Message, respect Content-Type provided by the user
X-Git-Tag: emacs-27.0.90~2106
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=138060e3661470128a071d17a48671842f108343;p=emacs.git

In Message, respect Content-Type provided by the user

* lisp/gnus/mml.el (mml-parse-1): Respect any Content-Type
inserted by the user instead of insisting on text/plain.
---

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index b664ebe3bf9..4a0d40ac0ed 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -295,6 +295,14 @@ part.  This is for the internal use, you should never modify the value.")
 			(t
 			 (mm-find-mime-charset-region point (point)
 						      mm-hack-charsets))))
+	;; If the user has inserted a Content-Type header, then
+	;; respect that instead of overwriting with "text/plain".
+	(save-restriction
+	  (narrow-to-region point (point))
+	  (let ((content-type (mail-fetch-field "content-type")))
+	    (when (and content-type
+		       (eq (car tag) 'part))
+	      (setcdr (assq 'type tag) content-type))))
 	(when (and (not raw) (memq nil charsets))
 	  (if (or (memq 'unknown-encoding mml-confirmation-set)
 		  (message-options-get 'unknown-encoding)