Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dec07eb..e08b5bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nntp.el (nntp-wait-for-string): Check for a process in the
+       current buffer instead of `nntp-server-buffer'.
+
 2002-09-09  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (gnus-button-man-handler): New variable.
@@ -17,10 +22,10 @@
        * gnus-srvr.el (gnus-browse-make-menu-bar): Add "d".
 
        * gnus-sum.el (gnus-summary-limit-to-unseen): New command and
-       keystroke. 
+       keystroke.
 
        * gnus-srvr.el (gnus-browse-describe-group): New command and
-       keystroke. 
+       keystroke.
 
 2002-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/nntp.el b/lisp/nntp.el
index c02b139..267b29e 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1523,11 +1523,13 @@ password contained in '~/.nntp-authinfo'."
 
 (defun nntp-wait-for-string (regexp)
   "Wait until string arrives in the buffer."
-  (let ((buf (current-buffer)))
+  (let ((buf (current-buffer))
+       proc)
     (goto-char (point-min))
-    (while (and (nntp-find-connection nntp-server-buffer)
+    (while (and (setq proc (get-buffer-process buf))
+               (memq (process-status proc) '(open run))
                (not (re-search-forward regexp nil t)))
-      (accept-process-output (nntp-find-connection nntp-server-buffer))
+      (accept-process-output proc)
       (set-buffer buf)
       (goto-char (point-min)))))