aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2022-07-16 10:57:26 +0200
committerStefan Kangas2022-07-16 10:57:26 +0200
commit69223ee97539a73dfd7eef9607e0d3a3911ea93b (patch)
treefbe08434863efee0797a505e9268d12af771f208
parent058cc53ea7778eeefaa72137b46cd7f7e83ce649 (diff)
downloademacs-69223ee97539a73dfd7eef9607e0d3a3911ea93b.tar.gz
emacs-69223ee97539a73dfd7eef9607e0d3a3911ea93b.zip
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.
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/gnus/gnus-group.el8
-rw-r--r--lisp/gnus/gnus-int.el5
-rw-r--r--lisp/gnus/gnus.el8
4 files changed, 9 insertions, 17 deletions
diff --git a/etc/NEWS b/etc/NEWS
index ba6692aace0..d99d0a008ef 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2317,8 +2317,9 @@ This change is now applied in 'dired-insert-directory'.
2317'font-lock-maximum-size', 'gnus-carpal', 2317'font-lock-maximum-size', 'gnus-carpal',
2318'gnus-debug-exclude-variables', 'gnus-debug-files', 2318'gnus-debug-exclude-variables', 'gnus-debug-files',
2319'gnus-local-domain', 'gnus-outgoing-message-group', 2319'gnus-local-domain', 'gnus-outgoing-message-group',
2320'gnus-registry-user-format-function-M', 'image-extension-data', 2320'gnus-secondary-servers', 'gnus-registry-user-format-function-M',
2321'image-library-alist', 'inhibit-first-line-modes-regexps', 2321'image-extension-data', 'image-library-alist',
2322'inhibit-first-line-modes-regexps',
2322'inhibit-first-line-modes-suffixes', 'intdos', 2323'inhibit-first-line-modes-suffixes', 'intdos',
2323'mail-complete-function', 'mail-completion-at-point-function', 2324'mail-complete-function', 'mail-completion-at-point-function',
2324'mail-mailer-swallows-blank-line', 'mail-sent-via', 'make-register', 2325'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 04d19e29a3a..a6b6c4a6cda 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4532,9 +4532,11 @@ and the second element is the address."
4532 ;; FIXME? gnus-secondary-servers is obsolete, 4532 ;; FIXME? gnus-secondary-servers is obsolete,
4533 ;; and it is not obvious that there is anything 4533 ;; and it is not obvious that there is anything
4534 ;; sensible to use instead in this particular case. 4534 ;; sensible to use instead in this particular case.
4535 (if (boundp 'gnus-secondary-servers) 4535 ;; (if (boundp 'gnus-secondary-servers)
4536 gnus-secondary-servers 4536 ;; gnus-secondary-servers
4537 (cdr gnus-select-method)))) 4537 ;; (cdr gnus-select-method))
4538 nil
4539 ))
4538 ;; We got a server name. 4540 ;; We got a server name.
4539 how))) 4541 how)))
4540 gnus-group-mode) 4542 gnus-group-mode)
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index f00f2a0d04e..a85510ba91e 100644
--- 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."
114 ;; Read server name with completion. 114 ;; Read server name with completion.
115 (setq gnus-nntp-server 115 (setq gnus-nntp-server
116 (gnus-completing-read "NNTP server" 116 (gnus-completing-read "NNTP server"
117 (cons gnus-nntp-server 117 nil nil gnus-nntp-server)))
118 (if (boundp 'gnus-secondary-servers)
119 gnus-secondary-servers))
120 nil gnus-nntp-server)))
121 118
122 (when (and gnus-nntp-server 119 (when (and gnus-nntp-server
123 (stringp gnus-nntp-server) 120 (stringp gnus-nntp-server)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 7eea08f1744..8221f3017a2 100644
--- 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 --
1110 sexp 1110 sexp
1111 string)) 1111 string))
1112 1112
1113(defcustom gnus-secondary-servers nil
1114 "List of NNTP servers that the user can choose between interactively.
1115To make Gnus query you for a server, you have to give `gnus' a
1116non-numeric prefix - `\\[universal-argument] \\[gnus]', in short."
1117 :group 'gnus-server
1118 :type '(repeat string))
1119(make-obsolete-variable 'gnus-secondary-servers 'gnus-select-method "24.1")
1120
1121(defcustom gnus-secondary-select-methods nil 1113(defcustom gnus-secondary-select-methods nil
1122 "A list of secondary methods that will be used for reading news. 1114 "A list of secondary methods that will be used for reading news.
1123This is a list where each element is a complete select method (see 1115This is a list where each element is a complete select method (see