From: yamaoka <yamaoka>
Date: Mon, 22 Nov 1999 12:06:16 +0000 (+0000)
Subject: (gnus-revision-number): Increment to 03.
X-Git-Tag: t-gnus-6_13_3-03~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d993a0e223bc963fff36da1f13e3225f06ab6675;p=elisp%2Fgnus.git-

(gnus-revision-number): Increment to 03.
(gnus-select-method): Use `condition-case' instead of `ignore-errors'.
---

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 650b6cd..f52c2e9 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -268,7 +268,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.13.3"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "02"
+(defconst gnus-revision-number "03"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "0.98"
@@ -900,18 +900,20 @@ used to 899, you would say something along these lines:
 		 (kill-buffer (current-buffer))))))))
 
 (defcustom gnus-select-method
-  (ignore-errors
-    (nconc
-     (list 'nntp (or (ignore-errors
-		       (gnus-getenv-nntpserver))
-		     (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))))
+  (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))
   "*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.