Sync with semi-1_13.

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

diff --git a/semi-setup.el b/semi-setup.el
index 10bc81a..db4e5c3 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -1,6 +1,6 @@
 ;;; semi-setup.el --- setup file for MIME-View.
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
@@ -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.")
@@ -72,7 +85,7 @@
 ;; for PGP
 (defvar mime-setup-enable-pgp
   (module-installed-p 'mailcrypt)
-  "*If it is non-nil, semi-setup sets uf to use mime-pgp.")
+  "*If it is non-nil, semi-setup sets up to use mime-pgp.")
 
 (if mime-setup-enable-pgp
     (eval-after-load "mime-view"
@@ -82,37 +95,41 @@
                     (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")
         ))
   )
 
+(if mime-setup-enable-pgp
+    (autoload 'mime-mc-setversion "mime-mc" nil t)
+  )
+
 
 ;;; @ for mime-edit
 ;;;
@@ -129,7 +146,7 @@
           (match-beginning 0)
         (point-max)
         ))
-      (eword-decode-header)
+      (mime-decode-header-in-buffer)
       (set-buffer-modified-p nil)
       )))