From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 26 Jan 2017 23:29:20 +0000 (+0100)
Subject: Don't try to find charsets of non-text MIME parts
X-Git-Tag: emacs-26.0.90~870^2~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5dd303fe7720f47d7d845723a2111e059a3b3ef6;p=emacs.git

Don't try to find charsets of non-text MIME parts

* lisp/gnus/mml.el (mml-generate-mime-1): It seems nonsensical
to try to determine the charset of non-text message parts, so
skip that (bug#24190).  This will also remove messages like
"bunzip2ing /tmp/acsb.cpio.bz2...done" while sending messages
if you include such files.
---

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index a4a47f929f4..a0ca624909f 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -695,11 +695,7 @@ be \"related\" or \"alternate\"."
 	       ((and filename
 		     (not (equal (cdr (assq 'nofile cont)) "yes")))
 		(let ((coding-system-for-read mm-binary-coding-system))
-		  (mm-insert-file-contents filename nil nil nil nil t))
-		(unless charset
-		  (setq charset (mm-coding-system-to-mime-charset
-				 (mm-find-buffer-file-coding-system
-				  filename)))))
+		  (mm-insert-file-contents filename nil nil nil nil t)))
 	       (t
 		(let ((contents (cdr (assq 'contents cont))))
 		  (if (multibyte-string-p contents)