[Emacs-diffs] master 5dd303f 2/2: Don't try to find charsets of non-text MIME parts

[Lars Ingebrigtsen]

branch: master
commit 5dd303fe7720f47d7d845723a2111e059a3b3ef6
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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.
---
 lisp/gnus/mml.el |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index a4a47f9..a0ca624 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)