2000-11-22 17:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* message.el (message-setup): Discourage using mc-install-*-mode.

	* gnus-setup.el (gnus-use-mailcrypt): Don't hook mail-crypt.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d82e0a3..4af0cea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-22 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-setup): Discourage using mc-install-*-mode.
+
+       * gnus-setup.el (gnus-use-mailcrypt): Don't hook mail-crypt.
+
 2000-11-22 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-cite.el (gnus-cite-parse): Guess citation length.

diff --git a/lisp/gnus-setup.el b/lisp/gnus-setup.el
index c98ef72..5bc7656 100644 (file)
--- a/lisp/gnus-setup.el
+++ b/lisp/gnus-setup.el
@@ -97,8 +97,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)))

diff --git a/lisp/message.el b/lisp/message.el
index ce804af..ca94c74 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3606,13 +3606,13 @@ than 988 characters long, and if they are not, trim them until they are."
     (setq message-buffer-list
          (nconc message-buffer-list (list (current-buffer))))))
 
-(defvar mc-modes-alist)
+;;;(defvar mc-modes-alist)
 (defun message-setup (headers &optional replybuffer actions)
-  (when (and (boundp 'mc-modes-alist)
-            (not (assq 'message-mode mc-modes-alist)))
-    (push '(message-mode (encrypt . mc-encrypt-message)
-                        (sign . mc-sign-message))
-         mc-modes-alist))
+;;;   (when (and (boundp 'mc-modes-alist)
+;;;         (not (assq 'message-mode mc-modes-alist)))
+;;;     (push '(message-mode (encrypt . mc-encrypt-message)
+;;;                     (sign . mc-sign-message))
+;;;      mc-modes-alist))
   (when actions
     (setq message-send-actions actions))
   (setq message-reply-buffer replybuffer)