Delete obsolete variable gnus-secondary-servers

* lisp/gnus/gnus.el (gnus-secondary-servers): Delete variable
obsolete since 24.1.
* lisp/gnus/gnus-group.el (gnus-group-browse-foreign-server):
* lisp/gnus/gnus-int.el (gnus-start-news-server): Don't use above
deleted variable.

diff --git a/etc/NEWS b/etc/NEWS
index ba6692aace0defb18dae90d068471d10c0544027..d99d0a008ef394b1b571bc6c3c46b861aa687a25 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2317,8 +2317,9 @@ This change is now applied in 'dired-insert-directory'.
 'font-lock-maximum-size', 'gnus-carpal',
 'gnus-debug-exclude-variables', 'gnus-debug-files',
 'gnus-local-domain', 'gnus-outgoing-message-group',
-'gnus-registry-user-format-function-M', 'image-extension-data',
-'image-library-alist', 'inhibit-first-line-modes-regexps',
+'gnus-secondary-servers', 'gnus-registry-user-format-function-M',
+'image-extension-data', 'image-library-alist',
+'inhibit-first-line-modes-regexps',
 'inhibit-first-line-modes-suffixes', 'intdos',
 'mail-complete-function', 'mail-completion-at-point-function',
 'mail-mailer-swallows-blank-line', 'mail-sent-via', 'make-register',

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 04d19e29a3ab9262dcf91e2cb3373990221ce962..a6b6c4a6cdaa1383fa37ec2667ae12f2a4ef868d 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4532,9 +4532,11 @@ and the second element is the address."
                      ;; FIXME? gnus-secondary-servers is obsolete,
                      ;; and it is not obvious that there is anything
                      ;; sensible to use instead in this particular case.
-                     (if (boundp 'gnus-secondary-servers)
-                         gnus-secondary-servers
-                       (cdr gnus-select-method))))
+                      ;; (if (boundp 'gnus-secondary-servers)
+                      ;;     gnus-secondary-servers
+                      ;;   (cdr gnus-select-method))
+                      nil
+                      ))
             ;; We got a server name.
             how)))
    gnus-group-mode)

diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index f00f2a0d04e532a5696645beccc05a16d4cef541..a85510ba91e8e2f70a758e6923b30a07aa56537d 100644 (file)
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -114,10 +114,7 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server."
        ;; Read server name with completion.
        (setq gnus-nntp-server
              (gnus-completing-read "NNTP server"
-                                    (cons gnus-nntp-server
-                                         (if (boundp 'gnus-secondary-servers)
-                                             gnus-secondary-servers))
-                                    nil gnus-nntp-server)))
+                                    nil nil gnus-nntp-server)))
 
       (when (and gnus-nntp-server
                 (stringp gnus-nntp-server)

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 7eea08f1744027f7bdde21986eb53234c105cae6..8221f3017a2e423955fc05f293ee3683a7186150 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1110,14 +1110,6 @@ that case, just return a fully prefixed name of the group --
                 sexp
                 string))
 
-(defcustom gnus-secondary-servers nil
-  "List of NNTP servers that the user can choose between interactively.
-To make Gnus query you for a server, you have to give `gnus' a
-non-numeric prefix - `\\[universal-argument] \\[gnus]', in short."
-  :group 'gnus-server
-  :type '(repeat string))
-(make-obsolete-variable 'gnus-secondary-servers 'gnus-select-method "24.1")
-
 (defcustom gnus-secondary-select-methods nil
   "A list of secondary methods that will be used for reading news.
 This is a list where each element is a complete select method (see