Synch to No Gnus 200502120211.

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

diff --git a/lisp/gnus-setup.el b/lisp/gnus-setup.el
index 106e0a9..25dfda0 100644 (file)
--- a/lisp/gnus-setup.el
+++ b/lisp/gnus-setup.el
@@ -1,6 +1,7 @@
 ;;; gnus-setup.el --- Initialization & Setup for Gnus 5
 
-;; Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 2000, 2001, 2004
+;;        Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 ;; Keywords: news
@@ -35,7 +36,7 @@
 (eval-when-compile (require 'cl))
 
 (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-mailcrypt (featurep 'xemacs)
   "*If non-nil use installed version of mailcrypt.")
@@ -89,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)
-  (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)))
@@ -139,8 +140,7 @@
 
 (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