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

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

diff --git a/tm-setup.el b/tm-setup.el
index e0f3f6d..913e5c4 100644 (file)
--- a/tm-setup.el
+++ b/tm-setup.el
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-setup.el,v 7.3 1996/05/08 15:00:00 morioka Exp $
+;;;    $Id: tm-setup.el,v 7.6 1996/08/07 05:59:03 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -96,28 +96,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 'append)
-      (add-hook 'gnus-startup-hook le 'append)
-      )))
+    (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