Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87f2b17..16f7f68 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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
+       when nntp-open-connection-function is nntp-open-network-stream.
+       Suggested by Sebastian D.B. Krause <krause@my.gnus.org>.
+
 2002-12-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnslashdot.el (nnslashdot-retrieve-headers-1): Update the parser.

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 267b29e..e00e7b8 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -435,8 +435,12 @@ noticing asynchronous data.")
                                nntp-address nntp-port-number
                                nntp-server-buffer
                                wait-for nnheader-callback-function)
-         ;; If nothing to wait for, still remove possibly echo'ed commands
-         (unless wait-for
+         ;; 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))
            (nntp-accept-response)
            (save-excursion
              (set-buffer buffer)