summaryrefslogtreecommitdiff
path: root/lisp/gnus/mml.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2017-01-27 00:29:20 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2017-01-27 00:30:54 +0100
commit5dd303fe7720f47d7d845723a2111e059a3b3ef6 (patch)
tree302c1946d63db40fedaa7e6bf9988ae7199c6336 /lisp/gnus/mml.el
parenta3b6d8e2ebf06f8d9b95e7b47894c8287cdcb15f (diff)
downloademacs-5dd303fe7720f47d7d845723a2111e059a3b3ef6.tar.gz
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.
Diffstat (limited to 'lisp/gnus/mml.el')
-rw-r--r--lisp/gnus/mml.el6
1 files changed, 1 insertions, 5 deletions
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)