From 75d21b67955d6b76b9b15399a9850c937c27f69a Mon Sep 17 00:00:00 2001 From: Kai Grossjohann Date: Sun, 8 Dec 2002 19:55:46 +0000 Subject: [PATCH] (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 . --- lisp/ChangeLog | 6 ++++++ lisp/nntp.el | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87f2b174d..16f7f6874 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2002-12-08 Kai Gro,A_(Bjohann + + * 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 . + 2002-12-07 ShengHuo ZHU * nnslashdot.el (nnslashdot-retrieve-headers-1): Update the parser. diff --git a/lisp/nntp.el b/lisp/nntp.el index 59cb24719..b4f0561e2 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -405,8 +405,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) -- 2.34.1