X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmm-bodies.el;h=21ee6c0c11a441f9289d36028f8c855fe4dc78c6;hb=779dd81d09cb6fa76e6a0fd64147099b7cf0119d;hp=b91a774491d481828cbb4cdd3a32862485d05a9d;hpb=ac3b087c73a63e271e40a8e134a345463323e292;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index b91a774..21ee6c0 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -225,6 +225,7 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
 	 (message "Error while decoding: %s" error)
 	 nil))
     (when (and
+	   type
 	   (memq encoding '(base64 x-uuencode x-uue x-binhex x-yenc))
 	   (string-match "\\`text/" type))
       (goto-char (point-min))
@@ -282,7 +283,11 @@ decoding.  If it is nil, default to `mail-parse-charset'."
     (setq charset mail-parse-charset))
   (or
    (when (featurep 'mule)
-     (let ((coding-system (mm-charset-to-coding-system charset)))
+     (let ((coding-system (mm-charset-to-coding-system
+			   charset
+			   ;; Allow overwrite using
+			   ;; `mm-charset-override-alist'.
+			   nil t)))
        (if (and (not coding-system)
 		(listp mail-parse-ignored-charsets)
 		(memq 'gnus-unknown mail-parse-ignored-charsets))