Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea68d17..8f93a64 100644 (file)
--- 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 abd5737..0a78cbe 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -125,7 +125,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 05147ed..b07b4b9 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -329,8 +329,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)))))
 
@@ -984,8 +984,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)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 033fc12..0938488 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-15 16:15:20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.texi (The Active File): Only old versionf of leafnode
+       doesn't do some.
+
 2001-01-23 23:28:08  Satomi Suzuki  <pan@mba.nifty.ne.jp>
 
        * message.texi (message-ignored-news-headers): Add "X-Draft-From:".

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index ccb208a..1e15aed 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1554,7 +1554,7 @@ Gnus \e$B$O5/F0$7$?$H$-$d!"<B:]$K?7$7$$5-;v$,E~Ce$7$F$$$k$+$r7hDj$7$h$&$H$9\e(B
 \e$B$I$N$h$&$K$;$h!"CY$$2s@~$G$O\e(B @code{some} \e$B$O\e(B @code{nil} \e$B$h$j$bB.$/!"$=$l\e(B
 \e$B$O$b$A$m$s\e(B@code{t} \e$B$h$j$bB.$/$J$j$^$9!#\e(B
 
-\e$B$$$/$D$+$N%K%e!<%9%5!<%P!<\e(B (\e$BNc$($P\e(B Leafnode \e$B$d8E$$\e(B INN) \e$B$K$OL?\e(B
+\e$B$$$/$D$+$N%K%e!<%9%5!<%P!<\e(B (\e$BNc$($P8E$$\e(B Leafnode \e$B$d8E$$\e(B INN) \e$B$K$OL?\e(B
 \e$BNa\e(B @code{LIST ACTIVE group} \e$B$,$"$j$^$;$s!#$=$&$$$&%5!<%P!<$K\e(B
 \e$B$O\e(B @code{nil} \e$B$r$3$NJQ?t$NCM$K@_Dj$9$k$N$,!"$*$=$i$/$b$C$H$bM-8z$G$7$g$&!#\e(B
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index b4ab127..06d7962 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1482,9 +1482,10 @@ support the @code{LIST ACTIVE group} command), on others this isn't fast
 at all.  In any case, @code{some} should be faster than @code{nil}, and
 is certainly faster than @code{t} over slow lines.
 
-Some news servers (Leafnode and old versions of INN, for instance) do
-not support the @code{LIST ACTIVE group}.  For these servers, @code{nil}
-is probably the most efficient value for this variable.
+Some news servers (old versions of Leafnode and old versions of INN, for
+instance) do not support the @code{LIST ACTIVE group}.  For these
+servers, @code{nil} is probably the most efficient value for this
+variable.
 
 If this variable is @code{nil}, gnus will ask for group info in total
 lock-step, which isn't very fast.  If it is @code{some} and you use an