From: yamaoka <yamaoka>
Date: Mon, 12 Dec 2005 00:48:44 +0000 (+0000)
Subject: Synch to No Gnus 200512120048.
X-Git-Tag: t-gnus-6_17_4-quimby-~183
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ba1a2d3fe7f826c2745bebde17910e6bb96f3b5a;p=elisp%2Fgnus.git-

Synch to No Gnus 200512120048.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06a9326..2bfe25c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-bodies.el (mm-decode-content-transfer-encoding): Protect
+	against the case where the 2nd arg TYPE is nil.
+
 2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* pop3.el (pop3-stream-type): Fix custom version.
diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 5822e4e..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))