From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 24 Jan 2001 11:30:30 +0000 (+0000)
Subject: * nntp.el (nntp-wait-for): Return the success code.
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=e2b66d4b6d527cc9cf7fbbb3e0d49fa91624e18a;p=gnus

* nntp.el (nntp-wait-for): Return the success code.
(nntp-open-connection): Use it.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7835d3a92..c778fab3e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-24 12:22:47  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nntp.el (nntp-wait-for): Return the success code.
+	(nntp-open-connection): Use it.
+
+2001-01-11 11:49:02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-int.el (gnus-check-server): Allow breaking the opening. 
+
 2001-01-23 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-sum.el (gnus-summary-print-article): Remove process mark.
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index dfb05729a..bd16df5ba 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -124,7 +124,10 @@ If it is down, start it up (again)."
 			(format " on %s" (nth 1 method)))))
       (gnus-run-hooks 'gnus-open-server-hook)
       (prog1
-	  (gnus-open-server method)
+	  (condition-case ()
+	      (gnus-open-server method)
+	    (quit (message "Quit gnus-check-server")
+		  nil))
 	(unless silent
 	  (message ""))))))
 
diff --git a/lisp/nntp.el b/lisp/nntp.el
index c11365705..866b4c2dd 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -290,8 +290,8 @@ noticing asynchronous data.")
 	      ;; Nix out "nntp reading...." message.
 	      (when nntp-have-messaged
 		(setq nntp-have-messaged nil)
-		(nnheader-message 5 ""))
-	      t))))
+		(nnheader-message 5 ""))))
+	  t))
       (unless discard
 	(erase-buffer)))))
 
@@ -899,8 +899,8 @@ password contained in '~/.nntp-authinfo'."
     (when (and (buffer-name pbuffer)
 	       process)
       (process-kill-without-query process)
-      (nntp-wait-for process "^.*\n" buffer nil t)
-      (if (memq (process-status process) '(open run))
+      (if (and (nntp-wait-for process "^200.*\n" buffer nil t)
+	       (memq (process-status process) '(open run)))
 	  (prog1
 	      (caar (push (list process buffer nil) nntp-connection-alist))
 	    (push process nntp-connection-list)