update.

[elisp/semi.git] / semi-setup.el

diff --git a/semi-setup.el b/semi-setup.el
index eb95dd1..4372035 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -105,33 +105,6 @@ it is used as hook to set."
                    (method . mime-verify-multipart/signed))
          'strict "mime-pgp")
         
-        (autoload 'mime-display-application/pgp-signature "mime-pgp")
-
-        (ctree-set-calist-strictly
-         'mime-preview-condition 
-         '((type . application)(subtype . pgp-signature)
-           (body . visible)
-           (body-presentation-method 
-            . mime-display-application/pgp-signature)))
-
-        (autoload 'mime-display-application/pgp-encrypted "mime-pgp")
-
-        (ctree-set-calist-strictly
-         'mime-preview-condition 
-         '((type . application)(subtype . pgp-encrypted)
-           (body . visible)
-           (body-presentation-method 
-            . mime-display-application/pgp-encrypted)))
-
-        (autoload 'mime-display-application/pgp-keys "mime-pgp")
-
-        (ctree-set-calist-strictly
-         'mime-preview-condition 
-         '((type . application)(subtype . pgp-keys)
-           (body . visible)
-           (body-presentation-method 
-            . mime-display-application/pgp-keys)))
-
         (mime-add-condition
          'action
          '((type . application)(subtype . pgp-signature)
@@ -149,6 +122,30 @@ it is used as hook to set."
          '((type . application)(subtype . pgp-keys)
            (method . mime-add-application/pgp-keys))
          'strict "mime-pgp")
+
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . pkcs7-signature)
+           (method . mime-verify-application/pkcs7-signature))
+         'strict "mime-pgp")
+
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . x-pkcs7-signature)
+           (method . mime-verify-application/pkcs7-signature))
+         'strict "mime-pgp")
+        
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . pkcs7-mime)
+           (method . mime-view-application/pkcs7-mime))
+         'strict "mime-pgp")
+
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . x-pkcs7-mime)
+           (method . mime-view-application/pkcs7-mime))
+         'strict "mime-pgp")
         ))
   )