*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0547a15..bce1e67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,7 +16,6 @@
        * gnus-agent.el (gnus-agent-group-path): Use it.
        * nnmail.el (nnmail-group-pathname): Use it.
 
->>>>>>> 5.147
 1999-11-07 21:07:55  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-start.el (gnus-active-to-gnus-format): Don't insert backslash

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 1c157d9..72942e9 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1669,7 +1669,8 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
       gnus-score-find-trace gnus-score-file-name)
      ("gnus-cus" :interactive t gnus-group-customize gnus-score-customize)
      ("gnus-topic" :interactive t gnus-topic-mode)
-     ("gnus-topic" gnus-topic-remove-group gnus-topic-set-parameters)
+     ("gnus-topic" gnus-topic-remove-group gnus-topic-set-parameters
+      gnus-subscribe-topics)
      ("gnus-salt" :interactive t gnus-pick-mode gnus-binary-mode)
      ("gnus-uu" (gnus-uu-extract-map keymap) (gnus-uu-mark-map keymap))
      ("gnus-uu" :interactive t