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

[elisp/gnus.git-] / lisp / gnus-setup.el

diff --git a/lisp/gnus-setup.el b/lisp/gnus-setup.el
index 106e0a9..ae9909b 100644 (file)
--- a/lisp/gnus-setup.el
+++ b/lisp/gnus-setup.el
@@ -1,6 +1,5 @@
 ;;; gnus-setup.el --- Initialization & Setup for Gnus 5
-
-;; Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 96 Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 ;; Keywords: news
@@ -34,43 +33,54 @@
 
 (eval-when-compile (require 'cl))
 
+(defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
+
 (defvar gnus-use-installed-gnus t
   "*If non-nil Use installed version of Gnus.")
 
-(defvar gnus-use-installed-mailcrypt (featurep 'xemacs)
+(defvar gnus-use-installed-tm running-xemacs
+  "*If non-nil use installed version of tm.")
+
+(defvar gnus-use-installed-mailcrypt running-xemacs
   "*If non-nil use installed version of mailcrypt.")
 
-(defvar gnus-emacs-lisp-directory (if (featurep 'xemacs)
+(defvar gnus-emacs-lisp-directory (if running-xemacs
                                      "/usr/local/lib/xemacs/"
                                    "/usr/local/share/emacs/")
   "Directory where Emacs site lisp is located.")
 
 (defvar gnus-gnus-lisp-directory (concat gnus-emacs-lisp-directory
-                                        "gnus/lisp/")
+                                        "gnus-5.0.15/lisp/")
   "Directory where Gnus Emacs lisp is found.")
 
+(defvar gnus-tm-lisp-directory (concat gnus-emacs-lisp-directory
+                                      "site-lisp/")
+  "Directory where TM Emacs lisp is found.")
+
 (defvar gnus-mailcrypt-lisp-directory (concat gnus-emacs-lisp-directory
-                                             "site-lisp/mailcrypt/")
+                                             "site-lisp/mailcrypt-3.4/")
   "Directory where Mailcrypt Emacs Lisp is found.")
 
 (defvar gnus-bbdb-lisp-directory (concat gnus-emacs-lisp-directory
-                                        "site-lisp/bbdb/")
+                                        "site-lisp/bbdb-1.51/")
   "Directory where Big Brother Database is found.")
 
+(defvar gnus-use-tm running-xemacs
+  "Set this if you want MIME support for Gnus")
 (defvar gnus-use-mhe nil
-  "Set this if you want to use MH-E for mail reading.")
+  "Set this if you want to use MH-E for mail reading")
 (defvar gnus-use-rmail nil
-  "Set this if you want to use RMAIL for mail reading.")
+  "Set this if you want to use RMAIL for mail reading")
 (defvar gnus-use-sendmail t
-  "Set this if you want to use SENDMAIL for mail reading.")
+  "Set this if you want to use SENDMAIL for mail reading")
 (defvar gnus-use-vm nil
-  "Set this if you want to use the VM package for mail reading.")
+  "Set this if you want to use the VM package for mail reading")
 (defvar gnus-use-sc nil
-  "Set this if you want to use Supercite.")
+  "Set this if you want to use Supercite")
 (defvar gnus-use-mailcrypt t
-  "Set this if you want to use Mailcrypt for dealing with PGP messages.")
+  "Set this if you want to use Mailcrypt for dealing with PGP messages")
 (defvar gnus-use-bbdb nil
-  "Set this if you want to use the Big Brother DataBase.")
+  "Set this if you want to use the Big Brother DataBase")
 
 (when (and (not gnus-use-installed-gnus)
           (null (member gnus-gnus-lisp-directory load-path)))
@@ -79,6 +89,19 @@
 ;;; We can't do this until we know where Gnus is.
 (require 'message)
 
+;;; Tools for MIME by
+;;; UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
+;;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+(when gnus-use-tm
+  (when (and (not gnus-use-installed-tm)
+            (null (member gnus-tm-lisp-directory load-path)))
+    (setq load-path (cons gnus-tm-lisp-directory load-path)))
+  ;; tm may or may not be dumped with XEmacs.  In Sunpro it is, otherwise
+  ;; it isn't.
+  (unless (featurep 'mime-setup)
+    (load "mime-setup")))
+
 ;;; Mailcrypt by
 ;;; Jin Choi <jin@atype.com>
 ;;; Patrick LoPresti <patl@lcs.mit.edu>