X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-topic.el;h=579a01085fba4e32a4c71116799e0f52064b652f;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=9023d031344bb48545a17f1e37fa1b4a0f2357ea;hpb=c3b7d1685c9733f400a1366ebfd0979a145cd426;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 9023d03..579a010 100644
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -1,6 +1,7 @@
 ;;; 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>
@@ -20,8 +21,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -395,7 +396,7 @@ If RECURSIVE is t, return groups in its subtopics too."
 (defun gnus-topic-hierarchical-parameters (topic)
   "Return a topic list computed for TOPIC."
   (let ((params-list (nreverse (mapcar 'gnus-topic-parameters
-				       (gnus-current-topic topic))))
+				       (gnus-current-topics topic))))
 	param out params)
     ;; We probably have lots of nil elements here, so
     ;; we remove them.  Probably faster than doing this "properly".
@@ -435,7 +436,7 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
 	      (copy-sequence gnus-group-listed-groups))))
 
     (gnus-update-format-specifications nil 'topic)
-    
+
     (when (or (not gnus-topic-alist)
 	      (not gnus-topology-checked-p))
       (gnus-topic-check-topology))
@@ -1134,10 +1135,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)