(mime-view-display-entity): Modify to omit check for

body-presentation-method.

diff --git a/mime-view.el b/mime-view.el
index 4e05ae2..d714772 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -707,23 +707,23 @@ The compressed face will be piped to this command.")
                                       (cons 'encoding   encoding)
                                       (cons 'major-mode major-mode)
                                       params)))
-          (body-filter (cdr (assq 'body-filter situation)))
-          (body-presentation-method 
-           (cdr (assq 'body-presentation-method situation))))
-      (cond ((functionp body-filter)
-            (save-restriction
-              (narrow-to-region (point-max)(point-max))
-              (insert-buffer-substring mime-raw-buffer end-of-header end)
-              (funcall body-filter ctype params encoding)
-              ))
-           ((functionp body-presentation-method)
-            (funcall body-presentation-method situation)
-            )
-           ((and (null entity-node-id)
-                 (null (mime-entity-children message-info)))
-            (goto-char (point-max))
-            (mime-view-insert-entity-button entity message-info subj)
-            ))
+          (body-filter (cdr (assq 'body-filter situation))))
+      (if (functionp body-filter)
+         (save-restriction
+           (narrow-to-region (point-max)(point-max))
+           (insert-buffer-substring mime-raw-buffer end-of-header end)
+           (funcall body-filter ctype params encoding)
+           )
+       (let ((body-presentation-method 
+              (cdr (assq 'body-presentation-method situation))))
+         (cond ((functionp body-presentation-method)
+                (funcall body-presentation-method situation)
+                )
+               ((and (null entity-node-id)
+                     (null (mime-entity-children message-info)))
+                (goto-char (point-max))
+                (mime-view-insert-entity-button entity message-info subj)
+                ))))
       (when (mime-view-entity-separator-visible-p entity message-info)
        (goto-char (point-max))
        (insert "\n"))