(mime-edit-x-emacs-value): Check `enable-multibyte-characters' is

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

diff --git a/semi-setup.el b/semi-setup.el
index 9e6a0af..33ec99c 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -1,12 +1,11 @@
 ;;; semi-setup.el --- setup file for MIME-View.
 
-;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: semi-setup.el,v 0.15 1997-03-14 08:46:14 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Setting for Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -25,20 +24,8 @@
 
 ;;; Code:
 
-(require 'mime-def)
-(require 'file-detect)
-
-
-;;; @ for mime-view
-;;;
-
-(call-after-loaded
- 'mime-view
- (function
-  (lambda ()
-    ;; for message/partial
-    (require 'mime-partial)
-    )))
+(require 'semi-def)
+(require 'path-util)
 
 
 ;; for image/* and X-Face
@@ -64,11 +51,42 @@
 
 ;; for PGP
 (if mime-setup-enable-pgp
-    (call-after-loaded 'mime-view
-                      (function
-                       (lambda ()
-                         (require 'mime-pgp)
-                         )))
+    (eval-after-load "mime-view"
+      '(progn
+        (mime-add-condition
+         'preview '((type . application)(subtype . pgp)
+                    (message-button . visible)))
+        (mime-add-condition
+         'action '((type . application)(subtype . pgp)
+                   (method . mime-method-for-application/pgp))
+         'strict "mime-pgp")
+        (mime-add-condition
+         'action '((type . text)(subtype . x-pgp)
+                   (method . mime-method-for-application/pgp)))
+        
+        (mime-add-condition
+         'action '((type . multipart)(subtype . signed)
+                   (method . mime-method-to-verify-multipart/signed))
+         'strict "mime-pgp")
+        
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . pgp-signature)
+           (method . mime-method-to-verify-application/pgp-signature))
+         'strict "mime-pgp")
+        
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . pgp-encrypted)
+           (method . mime-method-to-decrypt-application/pgp-encrypted))
+         'strict "mime-pgp")
+        
+        (mime-add-condition
+         'action
+         '((type . application)(subtype . pgp-keys)
+           (method . mime-method-to-add-application/pgp-keys))
+         'strict "mime-pgp")
+        ))
   )
 
 
@@ -111,19 +129,19 @@
 ;;;
 
 (defun mime-setup-set-signature-key ()
-  (let ((key (or (cdr (assq major-mode mime-setup-signature-key-alist))
-                mime-setup-default-signature-key)))
-    (define-key (current-local-map) key (function insert-signature))
-    ))
-
-(if mime-setup-use-signature
-    (progn
-      (autoload 'insert-signature "signature" "Insert signature" t)
-      (add-hook 'mime-edit-mode-hook 'mime-setup-set-signature-key)
-      (setq gnus-signature-file nil)
-      (setq mail-signature nil)
-      (setq message-signature nil)
-      ))
+  (let ((keymap (current-local-map)))
+    (if keymap
+       (let ((key
+              (or (cdr (assq major-mode mime-setup-signature-key-alist))
+                  mime-setup-default-signature-key)))
+         (define-key keymap key (function insert-signature))
+         ))))
+
+(when mime-setup-use-signature
+  (autoload 'insert-signature "signature" "Insert signature" t)
+  (add-hook 'mime-edit-mode-hook 'mime-setup-set-signature-key)
+  ;; (setq message-signature nil)
+  )
 
 
 ;;; @ for mu-cite