From: Julien Danjou <julien@danjou.info>
Date: Fri, 29 Oct 2010 13:35:54 +0000 (+0200)
Subject: Remove gnus-nntp-service
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=ef0b45ebbf11bcf682562c8eb0510543f6732dd6

Remove gnus-nntp-service

Signed-off-by: Julien Danjou <julien@danjou.info>
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c4346bfc..bac401284 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-29  Julien Danjou  <julien@danjou.info>
 
+	* gnus.el: Remove `gnus-nntp-service' variable.
+
 	* gnus-start.el (gnus-1): Remove x-splash calls.
 
 	* gnus-ems.el (gnus-x-splash): Remove.
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 318cdfebd..b344a5ef1 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -100,8 +100,6 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server."
 	;; Stream is already opened.
 	nil
       ;; Open NNTP server.
-      (unless gnus-nntp-service
-	(setq gnus-nntp-server nil))
       (when confirm
 	;; Read server name with completion.
 	(setq gnus-nntp-server
diff --git a/lisp/gnus.el b/lisp/gnus.el
index e0f30cbf5..556da8fc7 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1255,15 +1255,6 @@ by the user.
 If you want to change servers, you should use `gnus-select-method'.
 See the documentation to that variable.")
 
-;; Don't touch this variable.
-(defvar gnus-nntp-service "nntp"
-  "NNTP service name (\"nntp\" or 119).
-This is an obsolete variable, which is scarcely used.  If you use an
-nntp server for your newsgroup and want to change the port number
-used to 899, you would say something along these lines:
-
- (setq gnus-select-method '(nntp \"my.nntp.server\" (nntp-port-number 899)))")
-
 (defcustom gnus-nntpserver-file "/etc/nntpserver"
   "A file with only the name of the nntp server in it."
   :group 'gnus-files
@@ -1287,20 +1278,11 @@ Check the NNTPSERVER environment variable and the
 ;;;###autoload  (custom-autoload 'gnus-select-method "gnus"))
 
 (defcustom gnus-select-method
-  (condition-case nil
-      (nconc
-       (list 'nntp (or (condition-case nil
-			   (gnus-getenv-nntpserver)
-			 (error nil))
-		       (when (and gnus-default-nntp-server
-				  (not (string= gnus-default-nntp-server "")))
-			 gnus-default-nntp-server)
-		       "news"))
-       (if (or (null gnus-nntp-service)
-	       (equal gnus-nntp-service "nntp"))
-	   nil
-	 (list gnus-nntp-service)))
-    (error nil))
+  (list 'nntp (or (gnus-getenv-nntpserver)
+                  (when (and gnus-default-nntp-server
+                             (not (string= gnus-default-nntp-server "")))
+                    gnus-default-nntp-server)
+                  "news"))
   "Default method for selecting a newsgroup.
 This variable should be a list, where the first element is how the
 news is to be fetched, the second is the address.