Synch to No Gnus 200407261635.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd42a12..7170abf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-26  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-group.el (gnus-group-group-map, gnus-group-make-menu-bar):
+       Revert part of 2004-07-17 change below.
+
 2004-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * rfc2047.el (rfc2047-encode-region): Don't infloop.  Suggested by

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 7818828..2d21f8f 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -640,7 +640,7 @@ simple manner.")
   "a" gnus-group-make-archive-group
   "k" gnus-group-make-kiboze-group
   "l" gnus-group-nnimap-edit-acl
-  "m" gnus-group-make-group-simple
+  "m" gnus-group-make-group
   "n" gnus-group-make-shimbun-group
   "E" gnus-group-edit-group
   "e" gnus-group-edit-group-method
@@ -910,7 +910,6 @@ simple manner.")
        ["Kill all groups on level..." gnus-group-kill-level t])
        ("Foreign groups"
        ["Make a foreign group..." gnus-group-make-group t]
-       ["Make a foreign group..." gnus-group-make-group-simple t]
        ["Make a shimbun group..." gnus-group-make-shimbun-group t]
        ["Add a directory group..." gnus-group-make-directory-group t]
        ["Add the help group" gnus-group-make-help-group t]