Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16f7f68..fa0bfee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-09  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+       * nntp.el (nntp-send-command): Braino in last commit.  Replace
+       `and' with `or'.
+
 2002-12-08  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * nntp.el (nntp-send-command): Assume that echo does not happen

diff --git a/lisp/nntp.el b/lisp/nntp.el
index e00e7b8..d06c234 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -438,9 +438,9 @@ noticing asynchronous data.")
          ;; If nothing to wait for, still remove possibly echo'ed commands.
          ;; We don't have echos if nntp-open-connection-function
          ;; is `nntp-open-network-stream', so we skip this in that case.
-         (unless (and wait-for
-                      (equal nntp-open-connection-function
-                             'nntp-open-network-stream))
+         (unless (or wait-for
+                     (equal nntp-open-connection-function
+                            'nntp-open-network-stream))
            (nntp-accept-response)
            (save-excursion
              (set-buffer buffer)