From: yamaoka <yamaoka>
Date: Sun, 8 Dec 2002 22:41:20 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_10-00-quimby~48
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbfcce5a3e80f7f9a6c9d4b35093cee1a4d3b827;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87f2b17..16f7f68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-08  Kai Gro,A_(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
--- 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)