From 20011a522f0beb4d28fd1639a2a634db82fa099b Mon Sep 17 00:00:00 2001
From: hayashi <hayashi>
Date: Fri, 12 May 2000 08:09:31 +0000
Subject: [PATCH] * mime-view (mime-display-entity): Show header when message
 is attachment. (mime-display-text): Pass 7bit when no CTE
 is specified. Use mime-entity-body if available.
 (mime-display-message): Reconstruct list every time.

---
 ChangeLog    |    8 ++++++++
 mime-view.el |   27 +++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 872044e..7e684f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-12  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* mime-view (mime-display-entity): Show header when message
+	is attachment.
+	(mime-display-text): Pass 7bit when no CTE is specified.
+	Use mime-entity-body if available.
+	(mime-display-message): Reconstruct list every time.
+
 2000-05-02   Daiki Ueno  <ueno@unixuser.org>
 
 	* pgg-gpg.el (pgg-scheme-encrypt-region): Don't quote recipient;
diff --git a/mime-view.el b/mime-view.el
index a73bc98..fc08f14 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -631,8 +631,13 @@ Each elements are regexp of field-name.")
     (narrow-to-region (point-max) (point-max))
     (insert
      (decode-coding-string
-      (mime-decode-string (mime-entity-content entity)
-			  (cdr (assq 'encoding situation)))
+      (mime-decode-string
+       (if (fboundp 'mime-entity-body)
+	   ;; FLIM 1.14
+	   (mime-entity-body entity)
+	 ;; #### This is wrong, but...
+	 (mime-entity-content entity))
+       (or (cdr (assq 'encoding situation)) "7bit"))
       (or (cdr (assq 'coding situation))
 	  'binary)))))
 
@@ -1119,11 +1124,13 @@ With prefix, it prompts for coding-system."
 		(eq 'inline
 		    (mime-content-disposition-type
 		     (mime-entity-content-disposition entity))))
-      ;; This is attachment
-      (setq header-is-visible nil
-	    body-is-visible nil)
-      (put-alist 'header 'invisible situation)
-      (put-alist 'body 'invisible situation))
+      ;; This is attachment.
+      ;; But show header when this is root entity.
+      (if (mime-root-entity-p entity)
+	  (progn (setq body-is-visible nil)
+		 (put-alist 'body 'invisible situation))
+	(setq header-is-visible nil)
+	(put-alist 'header 'invisible situation)))
     (set-buffer preview-buffer)
     (setq nb (point))
     (save-restriction
@@ -1349,9 +1356,9 @@ keymap of MIME-View mode."
       (setq major-mode 'mime-view-mode)
       (setq mode-name "MIME-View")
       (mime-display-entity message nil
-			   `((entity-button . invisible)
-			     (header . visible)
-			     (major-mode . ,original-major-mode))
+			   (list (cons 'entity-button 'invisible)
+				 (cons 'header 'visible)
+				 (cons 'major-mode original-major-mode))
 			   preview-buffer)
       (mime-view-define-keymap default-keymap-or-function)
       (set (make-local-variable 'line-move-ignore-invisible) t)
-- 
1.7.10.4