gnus-start.el (gnus-find-new-newsgroups): Remove gnus-check-first-time-used.

gnus.el: Remove gnus-backup-default-subscribed-newsgroups.
gnus-group.el: Remove gnus-group-fetch-control.

5 files changed, 56 insertions, 143 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 00fcc7f3a50..ab16707d386 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-30  Julien Danjou  <julien@danjou.info>
+
+        * gnus-group.el: Remove gnus-group-fetch-control.
+
+        * gnus-start.el (gnus-find-new-newsgroups): Remove
+        gnus-check-first-time-used.
+
+        * gnus.el: Remove gnus-backup-default-subscribed-newsgroups.
+
 2010-10-30  Knut Anders Hatlen  <kahatlen@gmail.com>  (tiny change)
 
         * nnimap.el (nnimap-update-info): Allow 'ticked and other flags to be
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 83951834424..24215a61950 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -741,7 +741,6 @@ simple manner.")
   "e" gnus-score-edit-all-score)
 
 (gnus-define-keys (gnus-group-help-map "H" gnus-group-mode-map)
-  "C" gnus-group-fetch-control
   "d" gnus-group-describe-group
   "v" gnus-version)
 
@@ -807,10 +806,6 @@ simple manner.")
        ["Describe" gnus-group-describe-group :active (gnus-group-group-name)
         ,@(if (featurep 'xemacs) nil
             '(:help "Display description of the current group"))]
-       ["Fetch control message" gnus-group-fetch-control
-        :active (gnus-group-group-name)
-        ,@(if (featurep 'xemacs) nil
-            '(:help "Display the archived control message for the current group"))]
        ;; Actually one should check, if any of the marked groups gives t for
        ;; (gnus-check-backend-function 'request-expire-articles ...)
        ["Expire articles" gnus-group-expire-articles
@@ -4022,32 +4017,6 @@ If DONT-SCAN is non-nil, scan non-activated groups as well."
     (gnus-group-position-point)
     ret))
 
-(defun gnus-group-fetch-control (group)
-  "Fetch the archived control messages for the current group.
-If given a prefix argument, prompt for a group."
-  (interactive
-   (list (or (when current-prefix-arg
-               (gnus-group-completing-read))
-             (gnus-group-group-name)
-             gnus-newsgroup-name)))
-  (unless group
-    (error "No group name given"))
-  (let ((name (gnus-group-real-name group))
-        hierarchy)
-    (when (string-match "\\(^[^\\.]+\\)\\..*" name)
-      (setq hierarchy (match-string 1 name))
-      (if gnus-group-fetch-control-use-browse-url
-          (browse-url (concat "ftp://ftp.isc.org/usenet/control/"
-                              hierarchy "/" name ".gz"))
-        (let ((enable-local-variables nil))
-          (gnus-group-read-ephemeral-group
-           group
-           `(nndoc ,group (nndoc-address
-                           ,(find-file-noselect
-                             (concat "/ftp@ftp.isc.org:/usenet/control/"
-                                     hierarchy "/" name ".gz")))
-                   (nndoc-article-type mbox)) t nil nil))))))
-
 (defun gnus-group-describe-group (force &optional group)
   "Display a description of the current newsgroup."
   (interactive (list current-prefix-arg (gnus-group-group-name)))
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 857c7d5cb61..f480d304d4b 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1100,53 +1100,52 @@ for new groups, and subscribe the new groups as zombies."
                         'gnus-subscribe-zombies)
                   t)
                  (t gnus-check-new-newsgroups))))
-    (unless (gnus-check-first-time-used)
-      (if (or (consp check)
-              (eq check 'ask-server))
-          ;; Ask the server for new groups.
-          (gnus-ask-server-for-new-groups)
-        ;; Go through the active hashtb and look for new groups.
-        (let ((groups 0)
-              group new-newsgroups)
-          (gnus-message 5 "Looking for new newsgroups...")
-          (unless gnus-have-read-active-file
-            (gnus-read-active-file))
-          (setq gnus-newsrc-last-checked-date (message-make-date))
-          (unless gnus-killed-hashtb
-            (gnus-make-hashtable-from-killed))
-          ;; Go though every newsgroup in `gnus-active-hashtb' and compare
-          ;; with `gnus-newsrc-hashtb' and `gnus-killed-hashtb'.
-          (mapatoms
-           (lambda (sym)
-             (if (or (null (setq group (symbol-name sym)))
-                     (not (boundp sym))
-                     (null (symbol-value sym))
-                     (gnus-gethash group gnus-killed-hashtb)
-                     (gnus-gethash group gnus-newsrc-hashtb))
-                 ()
-               (let ((do-sub (gnus-matches-options-n group)))
-                 (cond
-                  ((eq do-sub 'subscribe)
-                   (setq groups (1+ groups))
-                   (gnus-sethash group group gnus-killed-hashtb)
-                   (gnus-call-subscribe-functions
-                    gnus-subscribe-options-newsgroup-method group))
-                  ((eq do-sub 'ignore)
-                   nil)
-                  (t
-                   (setq groups (1+ groups))
-                   (gnus-sethash group group gnus-killed-hashtb)
-                   (if gnus-subscribe-hierarchical-interactive
-                       (push group new-newsgroups)
-                     (gnus-call-subscribe-functions
-                      gnus-subscribe-newsgroup-method group)))))))
-           gnus-active-hashtb)
-          (when new-newsgroups
-            (gnus-subscribe-hierarchical-interactive new-newsgroups))
-          (if (> groups 0)
-              (gnus-message 5 "%d new newsgroup%s arrived."
-                            groups (if (> groups 1) "s have" " has"))
-            (gnus-message 5 "No new newsgroups.")))))))
+    (if (or (consp check)
+            (eq check 'ask-server))
+        ;; Ask the server for new groups.
+        (gnus-ask-server-for-new-groups)
+      ;; Go through the active hashtb and look for new groups.
+      (let ((groups 0)
+            group new-newsgroups)
+        (gnus-message 5 "Looking for new newsgroups...")
+        (unless gnus-have-read-active-file
+          (gnus-read-active-file))
+        (setq gnus-newsrc-last-checked-date (message-make-date))
+        (unless gnus-killed-hashtb
+          (gnus-make-hashtable-from-killed))
+        ;; Go though every newsgroup in `gnus-active-hashtb' and compare
+        ;; with `gnus-newsrc-hashtb' and `gnus-killed-hashtb'.
+        (mapatoms
+         (lambda (sym)
+           (if (or (null (setq group (symbol-name sym)))
+                   (not (boundp sym))
+                   (null (symbol-value sym))
+                   (gnus-gethash group gnus-killed-hashtb)
+                   (gnus-gethash group gnus-newsrc-hashtb))
+               ()
+             (let ((do-sub (gnus-matches-options-n group)))
+               (cond
+                ((eq do-sub 'subscribe)
+                 (setq groups (1+ groups))
+                 (gnus-sethash group group gnus-killed-hashtb)
+                 (gnus-call-subscribe-functions
+                  gnus-subscribe-options-newsgroup-method group))
+                ((eq do-sub 'ignore)
+                 nil)
+                (t
+                 (setq groups (1+ groups))
+                 (gnus-sethash group group gnus-killed-hashtb)
+                 (if gnus-subscribe-hierarchical-interactive
+                     (push group new-newsgroups)
+                   (gnus-call-subscribe-functions
+                    gnus-subscribe-newsgroup-method group)))))))
+         gnus-active-hashtb)
+        (when new-newsgroups
+          (gnus-subscribe-hierarchical-interactive new-newsgroups))
+        (if (> groups 0)
+            (gnus-message 5 "%d new newsgroup%s arrived."
+                          groups (if (> groups 1) "s have" " has"))
+          (gnus-message 5 "No new newsgroups."))))))
 
 (defun gnus-matches-options-n (group)
   ;; Returns `subscribe' if the group is to be unconditionally
@@ -1246,53 +1245,6 @@ for new groups, and subscribe the new groups as zombies."
       (setq gnus-newsrc-last-checked-date new-date))
     got-new))
 
-(defun gnus-check-first-time-used ()
-  (catch 'ended
-    ;; First check if any of the following files exist.  If they do,
-    ;; it's not the first time the user has used Gnus.
-    (dolist (file (list (concat gnus-current-startup-file ".el")
-                        (concat gnus-current-startup-file ".eld")
-                        (concat gnus-startup-file ".el")
-                        (concat gnus-startup-file ".eld")))
-      (when (file-exists-p file)
-        (throw 'ended nil)))
-    (gnus-message 6 "First time user; subscribing you to default groups")
-    (unless (gnus-read-active-file-p)
-      (let ((gnus-read-active-file t))
-        (gnus-read-active-file)))
-    (setq gnus-newsrc-last-checked-date (message-make-date))
-    ;; Subscribe to the default newsgroups.
-    (let ((groups (or gnus-default-subscribed-newsgroups
-                      gnus-backup-default-subscribed-newsgroups))
-          group)
-      (if (eq groups t)
-          ;; If t, we subscribe (or not) all groups as if they were new.
-          (mapatoms
-           (lambda (sym)
-             (when (setq group (symbol-name sym))
-               (let ((do-sub (gnus-matches-options-n group)))
-                 (cond
-                  ((eq do-sub 'subscribe)
-                   (gnus-sethash group group gnus-killed-hashtb)
-                   (gnus-call-subscribe-functions
-                    gnus-subscribe-options-newsgroup-method group))
-                  ((eq do-sub 'ignore)
-                   nil)
-                  (t
-                   (push group gnus-killed-list))))))
-           gnus-active-hashtb)
-        (dolist (group groups)
-          ;; Only subscribe the default groups that are activated.
-          (when (gnus-active group)
-            (gnus-group-change-level
-             group gnus-level-default-subscribed gnus-level-killed)))
-        (with-current-buffer gnus-group-buffer
-          ;; Don't error if the group already exists. This happens when a
-          ;; first-time user types 'F'. -- didier
-          (gnus-group-make-help-group t))
-        (when gnus-novice-user
-          (gnus-message 7 "`A k' to list killed groups"))))))
-
 (defun gnus-subscribe-group (group &optional previous method)
   "Subscribe GROUP and put it after PREVIOUS."
   (gnus-group-change-level
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 85fe9f2538f..53645bfdb5e 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2169,8 +2169,7 @@ increase the score of each group you read."
   "v" gnus-version
   "d" gnus-summary-describe-group
   "h" gnus-summary-describe-briefly
-  "i" gnus-info-find-node
-  "C" gnus-group-fetch-control)
+  "i" gnus-info-find-node)
 
 (gnus-define-keys (gnus-summary-backend-map "B" gnus-summary-mode-map)
   "e" gnus-summary-expire-articles
@@ -2747,9 +2746,6 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
          ["Original sort" gnus-summary-sort-by-original t])
         ("Help"
          ["Describe group" gnus-summary-describe-group t]
-         ["Fetch control message" gnus-group-fetch-control
-          ,@(if (featurep 'xemacs) nil
-              '(:help "Display the archived control message for the current group"))]
          ["Read manual" gnus-info-find-node t])
         ("Modes"
          ["Pick and read" gnus-pick-mode t]
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ab0d3b3e59a..d2149016461 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1389,11 +1389,6 @@ you could set this variable:
   :group 'gnus-server
   :type '(repeat gnus-select-method))
 
-(defvar gnus-backup-default-subscribed-newsgroups
-  '("news.announce.newusers" "news.groups.questions" "gnu.emacs.gnus")
-  "Default default new newsgroups the first time Gnus is run.
-Should be set in paths.el, and shouldn't be touched by the user.")
-
 (defcustom gnus-local-domain nil
   "Local domain name without a host name.
 The DOMAINNAME environment variable is used instead if it is defined.
@@ -1437,14 +1432,6 @@ list, Gnus will try all the methods in the list until it finds a match."
                                         (nnweb "refer" (nnweb-type google)))
                                  gnus-select-method))))
 
-(defcustom gnus-group-fetch-control-use-browse-url nil
-  "*Non-nil means that control messages are displayed using `browse-url'.
-Otherwise they are fetched with ange-ftp and displayed in an ephemeral
-group."
-  :version "22.1"
-  :group 'gnus-group-various
-  :type 'boolean)
-
 (defcustom gnus-use-cross-reference t
   "*Non-nil means that cross referenced articles will be marked as read.
 If nil, ignore cross references.  If t, mark articles as read in