This commit was generated by cvs2svn to compensate for changes in r296,

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

diff --git a/tm-setup.el b/tm-setup.el
index 0bd479a..36c98ad 100644 (file)
--- a/tm-setup.el
+++ b/tm-setup.el
@@ -1,12 +1,13 @@
 ;;;
-;;; $Id: tm-setup.el,v 6.1 1995/04/23 18:09:07 morioka Exp $
+;;; $Id: tm-setup.el,v 7.1 1995/12/20 15:27:35 morioka Exp $
 ;;;
 
 (require 'tl-misc)
 
 
-;;; @ for LaTeX
+;;; @ for tm-view
 ;;;
+
 (call-after-loaded
  'tm-view
  (function
@@ -14,6 +15,29 @@
     ;; for message/partial
     (require 'tm-partial)
     
+    ;; for anonymous ftp
+    (set-atype 'mime/content-decoding-condition
+              '((type . "message/external-body")
+                ("access-type" . "anon-ftp")
+                (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")
@@ -32,28 +56,20 @@
     )))
 
 
-;;; @ for Anonymous FTP (need of ange-ftp)
-;;;
-(call-after-loaded
- 'tm-view
- (function
-  (lambda ()
-    (set-atype 'mime/content-decoding-condition
-              '((type . "message/external-body")
-                ("access-type" . "anon-ftp")
-                (method . mime/decode-message/external-ftp)
-                ))
-    (autoload 'mime/decode-message/external-ftp "tm-ftp")
-    )))
-
-
 ;;; @ for RMAIL
 ;;;
-(require 'tm-rmail)
+
+(call-after-loaded 'rmail
+                  (function
+                   (lambda ()
+                     (require 'tm-rmail)
+                     ))
+                  'rmail-mode-hook)
 
 
 ;;; @ for mh-e
 ;;;
+
 (let ((le (function
           (lambda ()
             (require 'tm-mh-e)
@@ -67,12 +83,15 @@
 
 ;;; @ for GNUS
 ;;;
+
+(defvar tm-setup/use-gnusutil nil)
+
 (let ((le (function
           (lambda ()
             (require 'tm-gnus)
             ))
          ))
-  (if (boundp 'MULE)
+  (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))
@@ -81,8 +100,8 @@
        (add-hook 'gnusutil-initialize-hook le)
        )
     (progn
-      (add-hook 'gnus-Startup-hook le)
-      (add-hook 'gnus-startup-hook le)
+      (add-hook 'gnus-Startup-hook le 'append)
+      (add-hook 'gnus-startup-hook le 'append)
       )))