projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch to Gnus 200306240131.
[elisp/gnus.git-]
/
lisp
/
gnus-setup.el
diff --git
a/lisp/gnus-setup.el
b/lisp/gnus-setup.el
index
c98ef72
..
7ad8883
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
+;; Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
@@
-33,36
+35,27
@@
(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 Use installed version of Gnus.")
+ "*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
+(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
@@
-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)))