Use path-util.el instead of file-detect.el.

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

diff --git a/semi-setup.el b/semi-setup.el
index b69e69b..c64e17d 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: semi-setup.el,v 0.6 1997-02-28 04:44:27 tmorioka Exp $
+;; Version: $Id: semi-setup.el,v 0.18 1997-11-06 16:20:05 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -25,65 +25,9 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'mime-play)
-  )
-
-
-;;; @ Utility
-;;;
-
-(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 mime-view
-;;;
+(require 'mime-def)
+(require 'path-util)
 
-(call-after-loaded
- 'mime-view
- (function
-  (lambda ()
-    ;; for message/partial
-    (require 'mime-partial)
-    
-    ;; for anonymous ftp
-    (set-atype 'mime/content-decoding-condition
-              '((type . "message/external-body")
-                ("access-type" . "anon-ftp")
-                (method . mime-article/decode-message/external-ftp)
-                ))
-    (autoload 'mime-article/decode-message/external-ftp "tm-ftp")
-    
-    ;; for LaTeX
-    (set-atype 'mime/content-decoding-condition
-              '((type . "text/x-latex")
-                (method . mime/decode-text/latex)
-                ))
-    (set-atype 'mime/content-decoding-condition
-              '((type . "application/x-latex")
-                (method . mime/decode-text/latex)
-                ))
-    ;;(set-atype 'mime/content-decoding-condition
-    ;;         '((type . "application/octet-stream")
-    ;;           ("type" . "latex")
-    ;;           (method . mime/decode-text/latex)
-    ;;           ))
-    (autoload 'mime/decode-text/latex "tm-latex")
-    )))
-
-
-(defvar running-xemacs (string-match "XEmacs" emacs-version))
 
 ;; for image/* and X-Face
 (defvar mime-setup-enable-inline-image
@@ -104,40 +48,79 @@ it is used as hook to set."
 
 (defvar mime-setup-enable-pgp
   (module-installed-p 'mailcrypt)
-  "*If it is non-nil, semi-setup sets uf to use tm-pgp.")
+  "*If it is non-nil, semi-setup sets uf to use mime-pgp.")
 
 ;; for PGP
 (if mime-setup-enable-pgp
     (call-after-loaded 'mime-view
                       (function
                        (lambda ()
-                         (require 'tm-pgp)
+                         (require 'mime-pgp)
                          )))
   )
 
 
-;;; @ for mh-e
+;;; @ for mime-edit
 ;;;
 
-(defun semi-setup-load-emh ()
-  (require 'emh)
-  )
+(defun mime-setup-decode-message-header ()
+  (save-excursion
+    (save-restriction
+      (goto-char (point-min))
+      (narrow-to-region
+       (point-min)
+       (if (re-search-forward
+           (concat "^" (regexp-quote mail-header-separator) "$")
+           nil t)
+          (match-beginning 0)
+        (point-max)
+        ))
+      (eword-decode-header)
+      (set-buffer-modified-p nil)
+      )))
+
+(add-hook 'mime-edit-mode-hook 'mime-setup-decode-message-header)
+
+
+;;; @@ variables
+;;;
+
+(defvar mime-setup-use-signature t
+  "If it is not nil, mime-setup sets up to use signature.el.")
 
-(call-after-loaded 'mh-e 'semi-setup-load-emh 'mh-folder-mode-hook)
-(or (featurep 'mh-e)
-    (add-hook 'mh-letter-mode-hook 'semi-setup-load-emh)
-    )
+(defvar mime-setup-default-signature-key "\C-c\C-s"
+  "*Key to insert signature.")
 
+(defvar mime-setup-signature-key-alist '((mail-mode . "\C-c\C-w"))
+  "Alist of major-mode vs. key to insert signature.")
+
+
+;;; @@ for signature
+;;;
 
-;;; @ for Gnus
+(defun mime-setup-set-signature-key ()
+  (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))
+         ))))
+
+(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)
+      ))
+
+
+;;; @ for mu-cite
 ;;;
-  
-(defun semi-setup-load-gnus ()
-  (let (gnus-load-hook)
-    (require 'gnus-mime)
-    ))
 
-(add-hook 'gnus-load-hook 'semi-setup-load-gnus)
+(add-hook 'mu-cite/pre-cite-hook 'eword-decode-header)
 
 
 ;;; @ end