tm 7.104.

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

diff --git a/tm-setup.el b/tm-setup.el
index b230b47..f422be2 100644 (file)
--- a/tm-setup.el
+++ b/tm-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: tm-setup.el,v 7.10 1997/02/01 19:17:38 morioka Exp $
+;; Version: $Id: tm-setup.el,v 7.11 1997/02/10 06:11:06 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is part of tm (Tools for MIME).
@@ -98,14 +98,15 @@
 ;;; @ for RMAIL
 ;;;
 
-(or running-xemacs-with-mule
-    (call-after-loaded 'rmail
-                      (function
-                       (lambda ()
-                         (require 'tm-rmail)
-                         ))
-                      'rmail-mode-hook)
-    )
+(defun tm-setup/load-rmail ()
+  (or (and (boundp 'rmail-support-mime)
+          rmail-support-mime)
+      (require 'tm-rmail)
+      )
+  (remove-hook 'rmail-mode-hook 'tm-setup/load-rmail)
+  )
+
+(call-after-loaded 'rmail 'tm-setup/load-rmail 'rmail-mode-hook)
 
 
 ;;; @ for mh-e