projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-21
[gnus]
/
lisp
/
gnus-setup.el
diff --git
a/lisp/gnus-setup.el
b/lisp/gnus-setup.el
index
29c2a31
..
1acb6f2
100644
(file)
--- a/
lisp/gnus-setup.el
+++ b/
lisp/gnus-setup.el
@@
-1,5
+1,7
@@
;;; gnus-setup.el --- Initialization & Setup for Gnus 5
;;; gnus-setup.el --- Initialization & Setup for Gnus 5
-;; Copyright (C) 1995, 96 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 2000, 2001, 2004
+;; Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
@@
-33,52
+35,43
@@
(eval-when-compile (require 'cl))
(eval-when-compile (require 'cl))
-(defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
-
(defvar gnus-use-installed-gnus t
(defvar gnus-use-installed-gnus t
- "*If non-nil
U
se installed version of Gnus.")
+ "*If non-nil
u
se 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
+(defvar gnus-use-installed-mailcrypt (featurep 'xemacs)
"*If non-nil use installed version of mailcrypt.")
"*If non-nil use installed version of mailcrypt.")
-(defvar gnus-emacs-lisp-directory (if
running-xemacs
+(defvar gnus-emacs-lisp-directory (if
(featurep '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
"/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
-5.0.15
/lisp/")
+ "gnus/lisp/")
"Directory where Gnus Emacs lisp is found.")
"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
(defvar gnus-mailcrypt-lisp-directory (concat gnus-emacs-lisp-directory
- "site-lisp/mailcrypt
-3.4
/")
+ "site-lisp/mailcrypt/")
"Directory where Mailcrypt Emacs Lisp is found.")
(defvar gnus-bbdb-lisp-directory (concat gnus-emacs-lisp-directory
"Directory where Mailcrypt Emacs Lisp is found.")
(defvar gnus-bbdb-lisp-directory (concat gnus-emacs-lisp-directory
- "site-lisp/bbdb
-1.51
/")
+ "site-lisp/bbdb/")
"Directory where Big Brother Database is found.")
(defvar gnus-use-mhe nil
"Directory where Big Brother Database is found.")
(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
(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
(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
(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
(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
(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
(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)))
(when (and (not gnus-use-installed-gnus)
(null (member gnus-gnus-lisp-directory load-path)))
@@
-97,8
+90,8
@@
(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)
(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)
+
;;;
(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)))
(when gnus-use-mhe
(add-hook 'mh-folder-mode-hook 'mc-install-read-mode)
(add-hook 'mh-letter-mode-hook 'mc-install-write-mode)))
@@
-147,8
+140,7
@@
(when gnus-use-sc
(add-hook 'mail-citation-hook 'sc-cite-original)
(when gnus-use-sc
(add-hook 'mail-citation-hook 'sc-cite-original)
- (setq message-cite-function 'sc-cite-original)
- (autoload 'sc-cite-original "supercite"))
+ (setq message-cite-function 'sc-cite-original))
\f
;;;### (autoloads (gnus gnus-slave gnus-no-server) "gnus" "lisp/gnus.el" (12473 2137))
;;; Generated autoloads from lisp/gnus.el
\f
;;;### (autoloads (gnus gnus-slave gnus-no-server) "gnus" "lisp/gnus.el" (12473 2137))
;;; Generated autoloads from lisp/gnus.el
@@
-199,4
+191,5
@@
score the alt hierarchy, you'd say \"!alt.all\"." t nil))
(run-hooks 'gnus-setup-load-hook)
(run-hooks 'gnus-setup-load-hook)
+;;; arch-tag: 08e4af93-8565-46bf-905c-36229400609d
;;; gnus-setup.el ends here
;;; gnus-setup.el ends here