projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-summary-refer-thread): Implement a version that uses *-request-thread.
[gnus]
/
lisp
/
gnus-setup.el
diff --git
a/lisp/gnus-setup.el
b/lisp/gnus-setup.el
index
29c2a31
..
d5578ff
100644
(file)
--- a/
lisp/gnus-setup.el
+++ b/
lisp/gnus-setup.el
@@
-1,15
+1,17
@@
;;; 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, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
;; This file is part of GNU Emacs.
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-17,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; My head is starting to spin with all the different mail/news packages.
;;; Commentary:
;; My head is starting to spin with all the different mail/news packages.
@@
-33,52
+33,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
+88,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
+138,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