(gnus-group-gourp-map): Bind `gnus-group-make-shimbun-group' to `G n'.

(gnus-group-group-menu): Add `gnus-group-make-shimbun-group' to ``Foreign
groups'' in ``Groups' menu.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 210e88f..2a24372 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -556,6 +556,7 @@ ticked: The number of ticked articles."
     "k" gnus-group-make-kiboze-group
     "l" gnus-group-nnimap-edit-acl
     "m" gnus-group-make-group
+    "n" gnus-group-make-shimbun-group
     "E" gnus-group-edit-group
     "e" gnus-group-edit-group-method
     "p" gnus-group-edit-group-parameters
@@ -728,6 +729,7 @@ ticked: The number of ticked articles."
        ["Kill all groups on level..." gnus-group-kill-level t])
        ("Foreign groups"
        ["Make a foreign group" gnus-group-make-group 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]
        ["Add the archive group" gnus-group-make-archive-group t]
@@ -2194,33 +2196,6 @@ If SOLID (the prefix), create a solid group."
                       (nnwarchive-login ,login))))
     (gnus-group-make-group group method)))
 
-(defvar nnshimbun-type-definition)
-(defvar gnus-group-shimbun-server-history nil)
-
-(defun gnus-group-make-shimbun-group ()
-  "Create a nnshimbun group."
-  (interactive)
-  (require 'nnshimbun)
-  (let* ((minibuffer-setup-hook (append minibuffer-setup-hook
-                                       '(beginning-of-line)))
-        (server (completing-read
-                 "Shimbun address: "
-                 (mapcar (lambda (elem) (list (car elem)))
-                         nnshimbun-type-definition)
-                 nil t
-                 (or (car gnus-group-shimbun-server-history)
-                     (caar nnshimbun-type-definition))
-                 'gnus-group-shimbun-server-history))
-        (group (completing-read
-                "Group name: "
-                (mapcar (lambda (elem) (list elem))
-                        (cdr (assq 'groups
-                                   (cdr (assoc server
-                                               nnshimbun-type-definition)))))
-                nil t nil))
-        (nnshimbun-pre-fetch-article nil))
-    (gnus-group-make-group group `(nnshimbun ,server))))
-
 (defun gnus-group-make-archive-group (&optional all)
   "Create the (ding) Gnus archive group of the most recent articles.
 Given a prefix, create a full group."