(mmgnus-entity-body): Change to method `mime-entity-body'.

(mime-entity-content): Use `mime-entity-body' instead of `mmgnus-entity-body'.
(mime-write-entity-content): Ditto.
(mime-insert-entity): Ditto.
(mime-write-entity-body): Ditto.

diff --git a/lisp/mmgnus.el b/lisp/mmgnus.el
index fc6e510..534d704 100644 (file)
--- a/lisp/mmgnus.el
+++ b/lisp/mmgnus.el
@@ -95,10 +95,16 @@
                        (funcall field-decoder field-body len)
                      ;; Don't decode
                      field-body))
-           (insert "\n")
-           ))))))
+           (insert "\n")))))))
 
-(defun mmgnus-entity-body (entity)
+(luna-define-method mime-insert-header ((entity mmgnus-entity)
+                                       &optional invisible-fields
+                                       visible-fields)
+  (mmgnus-insert-header-from-string
+   (mmgnus-entity-header-internal entity)
+   invisible-fields visible-fields))
+
+(luna-define-method mime-entity-body ((entity mmgnus-entity))
    (cond
     ((bufferp (mmgnus-entity-body-internal entity))
      (with-current-buffer (mmgnus-entity-body-internal entity)
@@ -107,15 +113,8 @@
      (error "Invalid body object. %s"
            (mmgnus-entity-body-internal entity)))))
 
-(luna-define-method mime-insert-header ((entity mmgnus-entity)
-                                       &optional invisible-fields
-                                       visible-fields)
-  (mmgnus-insert-header-from-string
-   (mmgnus-entity-header-internal entity)
-   invisible-fields visible-fields))
-
 (luna-define-method mime-entity-content ((entity mmgnus-entity))
-  (mime-decode-string (mmgnus-entity-body entity)
+  (mime-decode-string (mime-entity-body entity)
                      (mime-entity-encoding entity)))
 
 (luna-define-method mime-insert-entity-content ((entity mmgnus-entity))
@@ -123,7 +122,7 @@
 
 (luna-define-method mime-write-entity-content ((entity mmgnus-entity) filename)
   (with-temp-buffer
-    (insert (mmgnus-entity-body entity))
+    (insert (mime-entity-body entity))
     (mime-write-decoded-region (point-min) (point-max)
                               filename
                               (or (mime-entity-encoding entity) "7bit"))))
@@ -131,7 +130,7 @@
 (luna-define-method mime-insert-entity ((entity mmgnus-entity))
   (insert (mmgnus-entity-header-internal entity)
          "\n"
-         (mmgnus-entity-body entity)))
+         (mime-entity-body entity)))
 
 (luna-define-method mime-write-entity ((entity mmgnus-entity) filename)
   (with-temp-buffer
@@ -140,7 +139,7 @@
 
 (luna-define-method mime-write-entity-body ((entity mmgnus-entity) filename)
   (with-temp-buffer
-    (insert (mmgnus-entity-body entity))
+    (insert (mime-entity-body entity))
     (write-region-as-binary (point-min) (point-max) filename)))
 
 (eval-and-compile