From: yamaoka <yamaoka>
Date: Wed, 13 Jul 2005 05:11:13 +0000 (+0000)
Subject: Synch to No Gnus 200507130503.
X-Git-Tag: t-gnus-6_17_4-quimby-~461
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3a13f2e0b5a9a7cd5420ef5590e58d470f9b3225;p=elisp%2Fgnus.git-

Synch to No Gnus 200507130503.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e99a11..b425bfa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-salt.el (gnus-pick-mode): Remove the 5th arg of
+	add-minor-mode.
+	(gnus-binary-mode): Ditto.
+
+	* gnus-topic.el (gnus-topic-mode): Ditto.
+
 2005-07-04  Lute Kamstra  <lute@gnu.org>
 
 	Update FSF's address in GPL notices.
diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index 01f20db..faf79cf 100644
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -128,8 +128,7 @@ It accepts the same format specs that `gnus-summary-line-format' does."
       ;; Set up the menu.
       (when (gnus-visual-p 'pick-menu 'menu)
 	(gnus-pick-make-menu-bar))
-      (add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map
-			   nil 'gnus-pick-mode)
+      (add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map)
       (gnus-run-hooks 'gnus-pick-mode-hook))))
 
 (defun gnus-pick-setup-message ()
@@ -362,8 +361,7 @@ This must be bound to a button-down mouse event."
       ;; Set up the menu.
       (when (gnus-visual-p 'binary-menu 'menu)
 	(gnus-binary-make-menu-bar))
-      (add-minor-mode 'gnus-binary-mode " Binary"
-			   gnus-binary-mode-map nil 'gnus-binary-mode)
+      (add-minor-mode 'gnus-binary-mode " Binary" gnus-binary-mode-map)
       (gnus-run-hooks 'gnus-binary-mode-hook))))
 
 (defun gnus-binary-display-article (article &optional all-header)
diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 2fdea5e..0b1448b 100644
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -1,6 +1,6 @@
 ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Ilja Weis <kult@uni-paderborn.de>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1134,10 +1134,7 @@ articles in the topic and its subtopics."
       (when (gnus-visual-p 'topic-menu 'menu)
 	(gnus-topic-make-menu-bar))
       (gnus-set-format 'topic t)
-      (add-minor-mode 'gnus-topic-mode " Topic"
-			   gnus-topic-mode-map nil (lambda (&rest junk)
-						     (interactive)
-						     (gnus-topic-mode nil t)))
+      (add-minor-mode 'gnus-topic-mode " Topic" gnus-topic-mode-map)
       (add-hook 'gnus-group-catchup-group-hook 'gnus-topic-update-topic)
       (set (make-local-variable 'gnus-group-prepare-function)
 	   'gnus-group-prepare-topics)