(rmail-decode-mime-message): Change arguments; use `mime-open-entity'

and `mime-display-message' instead of `mime-view-buffer'.
(rmail-search-mime-message): Modify for `rmail-decode-mime-message'.

diff --git a/mail/rmail-mime.el b/mail/rmail-mime.el
index 6e59f70..2ef09ea 100644 (file)
--- a/mail/rmail-mime.el
+++ b/mail/rmail-mime.el
@@ -32,12 +32,15 @@
   (insert-buffer-substring original-buffer start end)
   (mime-decode-header-in-buffer rmail-enable-mime))
 
-(defun rmail-decode-mime-message (decoded-buffer original-buffer start end)
+(defun rmail-decode-mime-message (decoded-buffer original-buffer msg)
   (save-excursion
     (set-buffer original-buffer)
     (save-restriction
-      (narrow-to-region start end)
-      (mime-view-buffer nil decoded-buffer)))
+      (narrow-to-region (rmail-msgbeg msg)
+                       (rmail-msgend msg))
+      (setq mime-message-structure
+           (mime-open-entity 'babyl original-buffer))
+      (mime-display-message mime-message-structure decoded-buffer)))
   (set-buffer decoded-buffer))
 
 (defun rmail-view-kill-rmail-buffer ()
@@ -120,13 +123,7 @@
   "Search the message of number MSG for REGEXP.
 If the search succeeds, return non-nil.  Otherwise, return nil."
   (save-excursion
-    (rmail-decode-mime-message " *RMAIL-temp-VIEW*"
-                              (current-buffer)
-                              (if (search-forward "\n*** EOOH ***\n"
-                                                  (rmail-msgend msg) t)
-                                  (match-end 0)
-                                (point))
-                              (rmail-msgend msg))
+    (rmail-decode-mime-message " *RMAIL-temp-VIEW*" (current-buffer) msg)
     (goto-char (point-min))
     (prog1 (re-search-forward regexp nil t)
       (kill-buffer " *RMAIL-temp-VIEW*"))))