--- a/lisp/tm/tm-setup.el	Mon Aug 13 08:48:43 2007 +0200
+++ b/lisp/tm/tm-setup.el	Mon Aug 13 08:49:20 2007 +0200
@@ -1,9 +1,9 @@
 ;;; tm-setup.el --- setup file for tm viewer.
 
-;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: tm-setup.el,v 1.2 1996/12/22 00:29:42 steve Exp $
+;; Version: $Id: tm-setup.el,v 1.3 1997/02/02 05:06:20 steve Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is part of tm (Tools for MIME).
@@ -63,8 +63,16 @@
     (autoload 'mime/decode-text/latex "tm-latex")
     )))
 
+
 ;; for image/* and X-Face
-(if running-xemacs
+(defvar mime-setup-enable-inline-image
+  (and window-system
+       (or running-xemacs
+	   (and (featurep 'mule)(module-installed-p 'bitmap))
+	   ))
+  "*If it is non-nil, tm-setup sets up to use tm-image.")
+
+(if mime-setup-enable-inline-image
     (call-after-loaded 'tm-view
 		       (function
 			(lambda ()
@@ -72,8 +80,13 @@
 			  )))
   )
 
+
+(defvar mime-setup-enable-pgp
+  (module-installed-p 'mailcrypt)
+  "*If it is non-nil, tm-setup sets uf to use tm-pgp.")
+
 ;; for PGP
-(if (module-installed-p 'mailcrypt)
+(if mime-setup-enable-pgp
     (call-after-loaded 'tm-view
 		       (function
 			(lambda ()