X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mmcooked.el;h=f55a34a6bb9933fe11240dffa2454cc6517aac0f;hb=e8ea02b2e1a304b4365f1cd9d3c54a34dd633886;hp=cd261f4f081321e8fbfafc1d6a38a0eb02e60c7f;hpb=9cf6838bc986b73bc83955794f7424e9d3e1539d;p=elisp%2Fflim.git

diff --git a/mmcooked.el b/mmcooked.el
index cd261f4..f55a34a 100644
--- a/mmcooked.el
+++ b/mmcooked.el
@@ -1,6 +1,6 @@
 ;;; mmcooked.el --- MIME entity implementation for binary buffer
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: MIME, multimedia, mail, news
@@ -32,40 +32,57 @@
 
 (mm-define-method write-entity-content ((entity cooked) filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
     (let ((encoding (or (mime-entity-encoding entity) "7bit")))
       (if (member encoding '("7bit" "8bit" "binary"))
-	  (write-region (mime-entity-body-start-internal entity)
-			(mime-entity-body-end-internal entity) filename)
-	(mime-write-decoded-region (mime-entity-body-start-internal entity)
-				   (mime-entity-body-end-internal entity)
-				   filename encoding)
+	  (write-region (mime-buffer-entity-body-start-internal entity)
+			(mime-buffer-entity-body-end-internal entity) filename)
+	(mime-write-decoded-region
+	 (mime-buffer-entity-body-start-internal entity)
+	 (mime-buffer-entity-body-end-internal entity)
+	 filename encoding)
 	))))
 
 (mm-define-method write-entity ((entity cooked) filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (write-region (mime-entity-header-start-internal entity)
-		  (mime-entity-body-end-internal entity)
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (write-region (mime-buffer-entity-header-start-internal entity)
+		  (mime-buffer-entity-body-end-internal entity)
 		  filename)
     ))
 
 (mm-define-method write-entity-body ((entity cooked) filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (write-region (mime-entity-body-start-internal entity)
-		  (mime-entity-body-end-internal entity)
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (write-region (mime-buffer-entity-body-start-internal entity)
+		  (mime-buffer-entity-body-end-internal entity)
 		  filename)
     ))
 
-(mm-define-method insert-decoded-header ((entity cooked)
-					 &optional invisible-fields
-					 visible-fields)
+(luna-define-method mime-insert-header ((entity mime-cooked-entity)
+					&optional invisible-fields
+					visible-fields)
   (let (default-mime-charset)
-    (funcall (mime-find-function 'insert-decoded-header 'buffer)
+    (funcall (car (luna-class-find-functions
+		   (luna-find-class 'mime-buffer-entity)
+		   'mime-insert-header))
 	     entity invisible-fields visible-fields)
     ))
 
+(mm-define-method insert-text-content ((entity cooked))
+  (let ((str (mime-entity-content entity)))
+    (insert
+     (if (member (mime-entity-encoding entity)
+		 '(nil "7bit" "8bit" "binary"))
+	 str
+       (decode-mime-charset-string str
+				   (or (mime-content-type-parameter
+					(mime-entity-content-type entity)
+					"charset")
+				       default-mime-charset)
+				   'CRLF)
+       ))))
+
 
 ;;; @ end
 ;;;