--- a/lisp/gnus/gnus-setup.el	Mon Aug 13 09:05:11 2007 +0200
+++ b/lisp/gnus/gnus-setup.el	Mon Aug 13 09:05:42 2007 +0200
@@ -1,7 +1,7 @@
 ;;; gnus-setup.el --- Initialization & Setup for Gnus 5
-;; Copyright (C) 1995, 96 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 96, 97 Free Software Foundation, Inc.
 
-;; Author: Steven L. Baur <steve@miranova.com>
+;; Author: Steven L. Baur <steve@altair.xemacs.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -29,10 +29,24 @@
 ;; not to byte compile this, and just arrange to have the .el loaded out
 ;; of .emacs.
 
+;; Dec-28 1996: Updated for better handling of preinstalled Gnus
+
 ;;; Code:
 
+(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-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 running-xemacs
 				      "/usr/local/lib/xemacs/"
 				    "/usr/local/share/emacs/")
@@ -42,10 +56,6 @@
 					 "gnus-5.0.15/lisp/")
   "Directory where Gnus Emacs lisp is found.")
 
-(defvar gnus-sgnus-lisp-directory (concat gnus-emacs-lisp-directory
-					  "sgnus/lisp/")
-  "Directory where September Gnus Emacs lisp is found.")
-
 (defvar gnus-tm-lisp-directory (concat gnus-emacs-lisp-directory
 				       "site-lisp/")
   "Directory where TM Emacs lisp is found.")
@@ -55,10 +65,10 @@
   "Directory where Mailcrypt Emacs Lisp is found.")
 
 (defvar gnus-bbdb-lisp-directory (concat gnus-emacs-lisp-directory
-					 "site-lisp/bbdb-1.50/")
+					 "site-lisp/bbdb-1.51/")
   "Directory where Big Brother Database is found.")
 
-(defvar gnus-use-tm t
+(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")
@@ -77,129 +87,129 @@
 (defvar gnus-use-september nil
   "Set this if you are using the experimental September Gnus")
 
-(let ((gnus-directory (if gnus-use-september
-			  gnus-sgnus-lisp-directory
-			gnus-gnus-lisp-directory)))
-  (if (null (member gnus-directory load-path))
-      (setq load-path (cons gnus-directory load-path))))
+(when (and (not gnus-use-installed-gnus)
+	   (null (member gnus-gnus-lisp-directory load-path)))
+  (setq load-path (cons gnus-gnus-lisp-directory load-path)))
+
+(require 'message)
 
 ;;; Tools for MIME by
 ;;; UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
 ;;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
 
-(if gnus-use-tm
-    (progn
-      (if (null (member gnus-tm-lisp-directory load-path))
- 	  (setq load-path (cons gnus-tm-lisp-directory load-path)))
-       (load "mime-setup")))
+(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>
 
-(if gnus-use-mailcrypt
-    (progn
-      (if (null (member gnus-mailcrypt-lisp-directory load-path))
- 	  (setq load-path (cons gnus-mailcrypt-lisp-directory load-path)))
-      (autoload 'mc-install-write-mode "mailcrypt" nil t)
-      (autoload 'mc-install-read-mode "mailcrypt" nil t)
-      (add-hook 'message-mode-hook 'mc-install-write-mode)
-      (add-hook 'gnus-summary-mode-hook 'mc-install-read-mode)
-      (if gnus-use-mhe
-	  (progn
-	    (add-hook 'mh-folder-mode-hook 'mc-install-read-mode)
- 	    (add-hook 'mh-letter-mode-hook 'mc-install-write-mode)))))
+(when gnus-use-mailcrypt
+  (when (and (not gnus-use-installed-mailcrypt)
+	     (null (member gnus-mailcrypt-lisp-directory load-path)))
+      (setq load-path (cons gnus-mailcrypt-lisp-directory load-path)))
+  (autoload 'mc-install-write-mode "mailcrypt" nil t)
+  (autoload 'mc-install-read-mode "mailcrypt" nil t)
+  (add-hook 'message-mode-hook 'mc-install-write-mode)
+  (add-hook 'gnus-summary-mode-hook 'mc-install-read-mode)
+  (when gnus-use-mhe
+    (add-hook 'mh-folder-mode-hook 'mc-install-read-mode)
+    (add-hook 'mh-letter-mode-hook 'mc-install-write-mode)))
 
 ;;; BBDB by
-;;; Jamie Zawinski <jwz@lucid.com>
+;;; Jamie Zawinski <jwz@netscape.com>
 
-(if gnus-use-bbdb
-    (progn
-      (if (null (member gnus-bbdb-lisp-directory load-path))
- 	  (setq load-path (cons gnus-bbdb-lisp-directory load-path)))
-      (autoload 'bbdb "bbdb-com"
-	"Insidious Big Brother Database" t)
-      (autoload 'bbdb-name "bbdb-com"
-	"Insidious Big Brother Database" t)
-      (autoload 'bbdb-company "bbdb-com"
-	"Insidious Big Brother Database" t)
-      (autoload 'bbdb-net "bbdb-com"
-	"Insidious Big Brother Database" t)
-      (autoload 'bbdb-notes "bbdb-com"
-	"Insidious Big Brother Database" t)
+(when gnus-use-bbdb
+  ;; bbdb will never be installed with emacs.
+  (when (null (member gnus-bbdb-lisp-directory load-path))
+    (setq load-path (cons gnus-bbdb-lisp-directory load-path)))
+  (autoload 'bbdb "bbdb-com"
+    "Insidious Big Brother Database" t)
+  (autoload 'bbdb-name "bbdb-com"
+    "Insidious Big Brother Database" t)
+  (autoload 'bbdb-company "bbdb-com"
+    "Insidious Big Brother Database" t)
+  (autoload 'bbdb-net "bbdb-com"
+    "Insidious Big Brother Database" t)
+  (autoload 'bbdb-notes "bbdb-com"
+    "Insidious Big Brother Database" t)
 
-      (if gnus-use-vm
-	  (progn
-	    (autoload 'bbdb-insinuate-vm "bbdb-vm"
-	      "Hook BBDB into VM" t)))
+  (when gnus-use-vm
+    (autoload 'bbdb-insinuate-vm "bbdb-vm"
+      "Hook BBDB into VM" t))
 
-      (if gnus-use-rmail
-	  (progn
-	    (autoload 'bbdb-insinuate-rmail "bbdb-rmail"
-	      "Hook BBDB into RMAIL" t)
-	    (add-hook 'rmail-mode-hook 'bbdb-insinuate-rmail)))
+  (when gnus-use-rmail
+    (autoload 'bbdb-insinuate-rmail "bbdb-rmail"
+      "Hook BBDB into RMAIL" t)
+    (add-hook 'rmail-mode-hook 'bbdb-insinuate-rmail))
 
-      (if gnus-use-mhe
-	  (progn
-	    (autoload 'bbdb-insinuate-mh "bbdb-mh"
-	      "Hook BBDB into MH-E" t)
-	    (add-hook 'mh-folder-mode-hook 'bbdb-insinuate-mh)))
+  (when gnus-use-mhe
+    (autoload 'bbdb-insinuate-mh "bbdb-mh"
+      "Hook BBDB into MH-E" t)
+    (add-hook 'mh-folder-mode-hook 'bbdb-insinuate-mh))
 
-      (autoload 'bbdb-insinuate-gnus "bbdb-gnus"
-	"Hook BBDB into Gnus" t)
-      (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus)
+  (autoload 'bbdb-insinuate-gnus "bbdb-gnus"
+    "Hook BBDB into Gnus" t)
+  (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus)
 
-      (if gnus-use-sendmail
-	  (progn
-	    (autoload 'bbdb-insinuate-sendmail "bbdb"
-	      "Insidious Big Brother Database" t)
-	    (add-hook 'mail-setup-hook 'bbdb-insinuate-sendmail)
-	    (add-hook 'message-setup-hook 'bbdb-insinuate-sendmail)))))
+  (when gnus-use-sendmail
+    (autoload 'bbdb-insinuate-sendmail "bbdb"
+      "Insidious Big Brother Database" t)
+    (add-hook 'mail-setup-hook 'bbdb-insinuate-sendmail)
+    (add-hook 'message-setup-hook 'bbdb-insinuate-sendmail)))
 
-(if gnus-use-sc
-    (progn
-      (add-hook 'mail-citation-hook 'sc-cite-original)
-      (setq message-cite-function 'sc-cite-original)
-      (autoload 'sc-cite-original "supercite")))
+(when gnus-use-sc
+  (add-hook 'mail-citation-hook 'sc-cite-original)
+  (setq message-cite-function 'sc-cite-original)
+  (autoload 'sc-cite-original "supercite"))
 
 ;;;### (autoloads (gnus-batch-score gnus-fetch-group gnus gnus-slave gnus-no-server gnus-update-format) "gnus" "lisp/gnus.el" (12473 2137))
 ;;; Generated autoloads from lisp/gnus.el
 
-(autoload 'gnus-update-format "gnus" "\
+;; Don't redo this if autoloads already exist
+(unless (fboundp 'gnus)
+  (autoload 'gnus-update-format "gnus" "\
 Update the format specification near point." t nil)
 
-(autoload 'gnus-slave-no-server "gnus" "\
+  (autoload 'gnus-slave-no-server "gnus" "\
 Read network news as a slave without connecting to local server." t nil)
 
-(autoload 'gnus-no-server "gnus" "\
+  (autoload 'gnus-no-server "gnus" "\
 Read network news.
 If ARG is a positive number, Gnus will use that as the
 startup level.  If ARG is nil, Gnus will be started at level 2. 
 If ARG is non-nil and not a positive number, Gnus will
 prompt the user for the name of an NNTP server to use.
-As opposed to `gnus', this command will not connect to the local server." t nil)
+As opposed to `gnus', this command will not connect to the local server."
+    t nil)
 
-(autoload 'gnus-slave "gnus" "\
+  (autoload 'gnus-slave "gnus" "\
 Read news as a slave." t nil)
 
-(autoload 'gnus "gnus" "\
+  (autoload 'gnus "gnus" "\
 Read network news.
 If ARG is non-nil and a positive number, Gnus will use that as the
 startup level.  If ARG is non-nil and not a positive number, Gnus will
 prompt the user for the name of an NNTP server to use." t nil)
 
-(autoload 'gnus-fetch-group "gnus" "\
+  (autoload 'gnus-fetch-group "gnus" "\
 Start Gnus if necessary and enter GROUP.
 Returns whether the fetching was successful or not." t nil)
 
-(defalias 'gnus-batch-kill 'gnus-batch-score)
+  (defalias 'gnus-batch-kill 'gnus-batch-score)
 
-(autoload 'gnus-batch-score "gnus" "\
+  (autoload 'gnus-batch-score "gnus" "\
 Run batched scoring.
 Usage: emacs -batch -l gnus -f gnus-batch-score <newsgroups> ...
 Newsgroups is a list of strings in Bnews format.  If you want to score
 the comp hierarchy, you'd say \"comp.all\".  If you would not like to
-score the alt hierarchy, you'd say \"!alt.all\"." t nil)
+score the alt hierarchy, you'd say \"!alt.all\"." t nil))
 
 ;;;***