update.

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

diff --git a/semi-setup.el b/semi-setup.el
index 10bc81a..4372035 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -27,11 +27,24 @@
 (require 'semi-def)
 (require 'path-util)
 
+(defun call-after-loaded (module func &optional hook-name)
+  "If MODULE is provided, then FUNC is called.
+Otherwise func is set to MODULE-load-hook.
+If optional argument HOOK-NAME is specified,
+it is used as hook to set."
+  (if (featurep module)
+      (funcall func)
+    (or hook-name
+       (setq hook-name (intern (concat (symbol-name module) "-load-hook")))
+       )
+    (add-hook hook-name func)
+    ))
+
 
 ;; 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.")
@@ -70,8 +83,7 @@
 
 
 ;; 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
@@ -82,33 +94,57 @@
                     (message-button . visible)))
         (mime-add-condition
          'action '((type . application)(subtype . pgp)
-                   (method . mime-method-for-application/pgp))
+                   (method . mime-view-application/pgp))
          'strict "mime-pgp")
         (mime-add-condition
          'action '((type . text)(subtype . x-pgp)
-                   (method . mime-method-for-application/pgp)))
+                   (method . mime-view-application/pgp)))
         
         (mime-add-condition
          'action '((type . multipart)(subtype . signed)
-                   (method . mime-method-to-verify-multipart/signed))
+                   (method . mime-verify-multipart/signed))
          'strict "mime-pgp")
         
         (mime-add-condition
          'action
          '((type . application)(subtype . pgp-signature)
-           (method . mime-method-to-verify-application/pgp-signature))
+           (method . mime-verify-application/pgp-signature))
          'strict "mime-pgp")
         
         (mime-add-condition
          'action
          '((type . application)(subtype . pgp-encrypted)
-           (method . mime-method-to-decrypt-application/pgp-encrypted))
+           (method . mime-decrypt-application/pgp-encrypted))
          'strict "mime-pgp")
         
         (mime-add-condition
          'action
          '((type . application)(subtype . pgp-keys)
-           (method . mime-method-to-add-application/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")
         ))
   )
@@ -129,7 +165,7 @@
           (match-beginning 0)
         (point-max)
         ))
-      (eword-decode-header)
+      (mime-decode-header-in-buffer)
       (set-buffer-modified-p nil)
       )))