Fix handling of unknown MIME type (bug#7651).

2 files changed, 15 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 504ebf59708..4f0a789ae33 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-04  Kenichi Handa  <handa@m17n.org>
+
+	* mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown
+	part as a plain text.
+	(rmail-mime-process-multipart): Set the default content-type to
+	nil for unknown multipart subtypes (bug#7651).
+
 2011-01-03  Brent Goodrick  <bgoodr@gmail.com>  (tiny change)
 
 	* abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index f6741023e64..a5d5bc149d9 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -741,7 +741,11 @@ directly."
 	  (cond ((eq (cdr bulk-data) 'text)
 		 (rmail-mime-insert-decoded-text entity))
 		((cdr bulk-data)
-		 (rmail-mime-insert-image entity)))))
+		 (rmail-mime-insert-image entity))
+		(t
+		 ;; As we don't know how to display the body, just
+		 ;; insert it as a text.
+		 (rmail-mime-insert-decoded-text entity)))))
     (put-text-property beg (point) 'rmail-mime-entity entity)))
 
 (defun test-rmail-mime-bulk-handler ()
@@ -819,7 +823,9 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
     (cond ((string-match "mixed" subtype)
 	   (setq content-type '("text/plain")))
 	  ((string-match "digest" subtype)
-	   (setq content-type '("message/rfc822"))))
+	   (setq content-type '("message/rfc822")))
+	  (t
+	   (setq content-type nil)))
 
     ;; Loop over all body parts, where beg points at the beginning of
     ;; the part and end points at the end of the part.  next points at