]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't try to find charsets of non-text MIME parts
authorLars Ingebrigtsen <larsi@gnus.org>
Thu, 26 Jan 2017 23:29:20 +0000 (00:29 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Thu, 26 Jan 2017 23:30:54 +0000 (00:30 +0100)
* 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

index a4a47f929f4440194a18f6280acad640328da89d..a0ca624909f728553ec227de78521426632399eb 100644 (file)
@@ -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)