From: morioka <morioka>
Date: Sat, 11 Apr 1998 22:17:33 +0000 (+0000)
Subject: (mime-preview-condition): Add (message-button . visible) to
X-Git-Tag: semi-1_2_2~13
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9aefdebe04c6c933eb54aa99002d73853a1e6e6;p=elisp%2Fsemi.git

(mime-preview-condition): Add (message-button . visible) to
application/pgp.
(mime-view-display-message): Don't use
'mime-view-content-button-visible-ctype-list; abolish it.
---

diff --git a/mime-view.el b/mime-view.el
index a5de61e..19978de 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -186,9 +186,6 @@ If optional argument MESSAGE-INFO is not specified,
 ;;; @@@ predicate function
 ;;;
 
-(defvar mime-view-content-button-visible-ctype-list
-  '("application/pgp"))
-
 (defun mime-view-entity-button-visible-p (entity message-info)
   "Return non-nil if header of ENTITY is visible.
 Please redefine this function if you want to change default setting."
@@ -356,6 +353,7 @@ Each elements are regexp of field-name.")
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . application)(subtype . pgp)
+			   (message-button . visible)
 			   (body . visible)))
 
 (ctree-set-calist-strictly
@@ -687,11 +685,6 @@ The compressed face will be piped to this command.")
 	  ))
       (run-hooks 'mime-view-content-header-filter-hook)
       )
-    (if (member ctype mime-view-content-button-visible-ctype-list)
-	(save-excursion
-	  (goto-char (point-max))
-	  (mime-view-insert-entity-button message-info message-info subj)
-	  ))
     (let* ((situation
 	    (ctree-match-calist mime-preview-condition
 				(list* (cons 'type       media-type)
@@ -699,8 +692,14 @@ The compressed face will be piped to this command.")
 				       (cons 'encoding   encoding)
 				       (cons 'major-mode major-mode)
 				       params)))
+	   (message-button
+	    (cdr (assq 'message-button situation)))
 	   (body-presentation-method
 	    (cdr (assq 'body-presentation-method situation))))
+      (when message-button
+	(goto-char (point-max))
+	(mime-view-insert-entity-button message-info message-info subj)
+	)
       (cond ((eq body-presentation-method 'with-filter)
 	     (let ((body-filter (cdr (assq 'body-filter situation))))
 	       (save-restriction