* Sync up to flim-1_12_5 from flim-1_12_1.

[elisp/flim.git] / mmgeneric.el

diff --git a/mmgeneric.el b/mmgeneric.el
index 6dbfe4a..1f7cbbc 100644 (file)
--- a/mmgeneric.el
+++ b/mmgeneric.el
@@ -1,6 +1,6 @@
 ;;; mmgeneric.el --- MIME entity module for generic 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
@@ -100,6 +100,13 @@
                       (mime-entity-body-end-internal entity))
      (mime-entity-encoding entity))))
 
+(mm-define-method insert-entity-content ((entity generic))
+  (insert (with-current-buffer (mime-entity-buffer entity)
+           (mime-decode-string
+            (buffer-substring (mime-entity-body-start-internal entity)
+                              (mime-entity-body-end-internal entity))
+            (mime-entity-encoding entity)))))
+
 (mm-define-method write-entity-content ((entity generic) filename)
   (save-excursion
     (set-buffer (mime-entity-buffer entity))
@@ -109,6 +116,12 @@
                               (or (mime-entity-encoding entity) "7bit"))
     ))
 
+(mm-define-method insert-entity ((entity generic))
+  (insert-buffer-substring (mime-entity-buffer entity)
+                          (mime-entity-header-start-internal entity)
+                          (mime-entity-body-end-internal entity))
+  )
+
 (mm-define-method write-entity ((entity generic) filename)
   (save-excursion
     (set-buffer (mime-entity-buffer entity))
@@ -148,6 +161,8 @@
                                              &optional invisible-fields
                                              visible-fields)
   (let ((the-buf (current-buffer))
+       (mode-obj (mime-find-field-presentation-method 'wide))
+       field-decoder
        f-b p f-e field-name len field field-body)
     (save-excursion
       (set-buffer buffer)
@@ -162,13 +177,22 @@
                f-e (std11-field-end))
          (when (mime-visible-field-p field-name
                                      visible-fields invisible-fields)
-           (setq field (buffer-substring f-b (1- p))
-                 field-body (buffer-substring p f-e))
+           (setq field (intern
+                        (capitalize (buffer-substring f-b (1- p))))
+                 field-body (buffer-substring p f-e)
+                 field-decoder (inline (mime-find-field-decoder-internal
+                                        field mode-obj)))
            (with-current-buffer the-buf
-             (insert
-               field-name
-               (eword-decode-field-body field-body field nil t)
-              "\n")
+             (setq p (point))
+             (insert field-name)
+             (insert (if field-decoder
+                         (funcall field-decoder field-body len)
+                       ;; Don't decode
+                       field-body))
+             (insert "\n")
+              (add-text-properties p (point)
+                                   (list 'original-field-name (substring field-name 0 (1- len))
+                                         'original-field-body (ew-lf-to-crlf field-body)))
              )))))))
 
 (mm-define-method insert-header ((entity generic)