* nnshimbun.el (nnshimbun-request-expire-articles): Don't refer to the

[elisp/gnus.git-] / lisp / gnus-group.el

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index ef7a37e..2a7e530 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2426,31 +2426,8 @@ 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))))
+(autoload 'gnus-group-make-shimbun-group
+  "nnshimbun" "Create a nnshimbun group." t)
 
 (defun gnus-group-make-archive-group (&optional all)
   "Create the (ding) Gnus archive group of the most recent articles.
@@ -3709,6 +3686,12 @@ The hook `gnus-exit-gnus-hook' is called before actually exiting."
                     (file-name-nondirectory gnus-current-startup-file))))
     (gnus-run-hooks 'gnus-exit-gnus-hook)
     (gnus-configure-windows 'group t)
+    (when (and (gnus-buffer-live-p gnus-dribble-buffer)
+              (not (zerop (save-excursion
+                           (set-buffer gnus-dribble-buffer)
+                           (buffer-size)))))
+      (gnus-dribble-enter
+       ";;; Gnus was exited on purpose without saving the .newsrc files."))
     (gnus-dribble-save)
     (gnus-close-backends)
     (gnus-clear-system)