X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-setup.el;h=9aaf7c5af6e93671eddaafdac52d9ffe8e8405ed;hb=4147649b08eee05cb06808657c11b829aebf7e2f;hp=913e5c440919fb6f1eae4fe44d7c26e378246d2a;hpb=c6b287dbd7789726678fcdc1ec497bdda703e8a6;p=elisp%2Ftm.git

diff --git a/tm-setup.el b/tm-setup.el
index 913e5c4..9aaf7c5 100644
--- a/tm-setup.el
+++ b/tm-setup.el
@@ -1,30 +1,28 @@
-;;;
 ;;; tm-setup.el --- setup file for tm viewer.
-;;;
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
-;;;
-;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Version:
-;;;	$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).
-;;;
-;;; 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.  If not, write to the Free Software
-;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-;;;
+
+;; 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)
@@ -47,12 +45,7 @@
 		 (method . mime/decode-message/external-ftp)
 		 ))
     (autoload 'mime/decode-message/external-ftp "tm-ftp")
-    
-    ;; for image/*
-    (if running-xemacs
-	(require 'tm-image)
-      )
-    
+        
     ;; for LaTeX
     (set-atype 'mime/content-decoding-condition
 	       '((type . "text/x-latex")
@@ -70,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