X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-setup.el;h=9aaf7c5af6e93671eddaafdac52d9ffe8e8405ed;hb=8e18eb1fd95180a6ea115a00ce2f045815809b49;hp=1e1ec6546a56197f46d9552d7557dfbf3f46dad5;hpb=dd258a793c3c7c88ad91d59192ab55bbf1082a8f;p=elisp%2Ftm.git

diff --git a/tm-setup.el b/tm-setup.el
index 1e1ec65..9aaf7c5 100644
--- a/tm-setup.el
+++ b/tm-setup.el
@@ -1,6 +1,29 @@
-;;;
-;;; $Id: tm-setup.el,v 7.0 1995/12/17 13:02:30 morioka Exp $
-;;;
+;;; tm-setup.el --- setup file for tm viewer.
+
+;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Version: $Id: tm-setup.el,v 7.8 1996/12/10 11:41:22 morioka Exp $
+;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
+
+;; This file is part of tm (Tools for MIME).
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with This program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
 (require 'tl-misc)
 
@@ -22,22 +45,7 @@
 		 (method . mime/decode-message/external-ftp)
 		 ))
     (autoload 'mime/decode-message/external-ftp "tm-ftp")
-
-    ;; for text/richtext
-    (set-alist 'mime-viewer/content-filter-alist
-	       "text/richtext" (function mime-viewer/filter-text/richtext))
-    (autoload 'mime-viewer/filter-text/richtext "tm-rich")
-
-    ;; for text/enriched
-    (set-alist 'mime-viewer/content-filter-alist
-	       "text/enriched" (function mime-viewer/filter-text/enriched))
-    (autoload 'mime-viewer/filter-text/enriched "tm-rich")
-
-    ;; for image/*
-    (if (string-match "XEmacs" emacs-version)
-	(require 'tm-image)
-      )
-    
+        
     ;; for LaTeX
     (set-atype 'mime/content-decoding-condition
 	       '((type . "text/x-latex")
@@ -55,16 +63,36 @@
     (autoload 'mime/decode-text/latex "tm-latex")
     )))
 
+;; for image/* and X-Face
+(if running-xemacs
+    (call-after-loaded 'tm-view
+		       (function
+			(lambda ()
+			  (require 'tm-image)
+			  )))
+  )
+
+;; for PGP
+(if (module-installed-p 'mailcrypt)
+    (call-after-loaded 'tm-view
+		       (function
+			(lambda ()
+			  (require 'tm-pgp)
+			  )))
+  )
+
 
 ;;; @ for RMAIL
 ;;;
 
-(call-after-loaded 'rmail
-		   (function
-		    (lambda ()
-		      (require 'tm-rmail)
-		      ))
-		   'rmail-mode-hook)
+(or running-xemacs-with-mule
+    (call-after-loaded 'rmail
+		       (function
+			(lambda ()
+			  (require 'tm-rmail)
+			  ))
+		       'rmail-mode-hook)
+    )
 
 
 ;;; @ for mh-e
@@ -81,28 +109,42 @@
     ))
 
 
-;;; @ for GNUS
+;;; @ for GNUS and Gnus
 ;;;
 
-(defvar tm-setup/use-gnusutil nil)
-
-(let ((le (function
-	   (lambda ()
-	     (require 'tm-gnus)
-	     ))
-	  ))
+(if (featurep 'gnus)
+    (if (boundp 'gnus-load-hook)
+	(require 'gnus-mime)
+      (require 'tm-gnus)
+      )
+  ;; for GNUS
+  (defvar tm-setup/use-gnusutil nil)
+  
+  (defun tm-setup/load-GNUS ()
+    (require 'tm-gnus)
+    )
+  
   (if (and (boundp 'MULE) tm-setup/use-gnusutil)
       (progn
 	(add-hook 'gnus-Group-mode-hook (function gnusutil-initialize))
 	(add-hook 'gnus-group-mode-hook (function gnusutil-initialize))
 	(autoload 'gnusutil-initialize "gnusutil")
 	(autoload 'gnusutil-add-group "gnusutil")
-	(add-hook 'gnusutil-initialize-hook le)
+	(add-hook 'gnusutil-initialize-hook 'tm-setup/load-GNUS)
 	)
-    (progn
-      (add-hook 'gnus-Startup-hook le)
-      (add-hook 'gnus-startup-hook le)
-      )))
+    (add-hook 'gnus-Startup-hook 'tm-setup/load-GNUS 'append)
+    (add-hook 'gnus-startup-hook 'tm-setup/load-GNUS 'append)
+    )
+  
+  ;; for Gnus
+  (defun tm-setup/load-gnus ()
+    (let (gnus-load-hook)
+      (remove-hook 'gnus-startup-hook 'tm-setup/load-GNUS)
+      (require 'gnus-mime)
+      ))
+  
+  (add-hook 'gnus-load-hook 'tm-setup/load-gnus)
+  )
 
 
 ;;; @ end
@@ -110,8 +152,4 @@
 
 (provide 'tm-setup)
 
-;;; Local Variables:
-;;; mode: emacs-lisp
-;;; mode: outline-minor
-;;; outline-regexp: ";;; @+\\|(......"
-;;; End:
+;;; tm-setup.el ends here