* mime-image.el: Remove X-Face setting; require cl when compiling.

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

diff --git a/semi-setup.el b/semi-setup.el
index e7decc8..4372035 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -44,7 +44,7 @@ it is used as hook to set."
 ;; for image/* and X-Face
 (defvar mime-setup-enable-inline-image
   (and window-system
-       (or running-xemacs
+       (or (featurep 'xemacs)
           (and (featurep 'mule)(module-installed-p 'bitmap))
           ))
   "*If it is non-nil, semi-setup sets up to use mime-image.")
@@ -83,8 +83,7 @@ it is used as hook to set."
 
 
 ;; for PGP
-(defvar mime-setup-enable-pgp
-  (module-installed-p 'mailcrypt)
+(defvar mime-setup-enable-pgp t
   "*If it is non-nil, semi-setup sets uf to use mime-pgp.")
 
 (if mime-setup-enable-pgp
@@ -123,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")
         ))
   )
 
@@ -142,7 +165,7 @@ it is used as hook to set."
           (match-beginning 0)
         (point-max)
         ))
-      (eword-decode-header)
+      (mime-decode-header-in-buffer)
       (set-buffer-modified-p nil)
       )))