# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1294124986 -32400
# Node ID 6fd3dcdcc67528db18d2370c9b77eaf62f52fdf9
# Parent  fd7837a29da36ec203c9e0848b2f163da952f806
Fix handling of unknown MIME type (bug#7651).

diff -r fd7837a29da3 -r 6fd3dcdcc675 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 04 15:57:54 2011 +0900
+++ b/lisp/ChangeLog	Tue Jan 04 16:09:46 2011 +0900
@@ -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 -r fd7837a29da3 -r 6fd3dcdcc675 lisp/mail/rmailmm.el
--- a/lisp/mail/rmailmm.el	Tue Jan 04 15:57:54 2011 +0900
+++ b/lisp/mail/rmailmm.el	Tue Jan 04 16:09:46 2011 +0900
@@ -741,7 +741,11 @@
 	  (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 @@
     (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