[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100359: Fix handling of unknown MIME type (bug#7651).

[Kenichi Handa]

------------------------------------------------------------
revno: 100359 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Tue 2011-01-04 16:10:30 +0900
message:
  Fix handling of unknown MIME type (bug#7651).
modified:
  lisp/ChangeLog
  lisp/mail/rmailmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-03 06:21:35 +0000
+++ b/lisp/ChangeLog    2011-01-04 07:09:46 +0000
@@ -1,3 +1,10 @@
+2011-01-04  Kenichi Handa  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2011-01-02 23:50:46 +0000
+++ b/lisp/mail/rmailmm.el      2011-01-04 07:09:46 +0000
@@ -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