From 1e5422698d922dcfb0b2b550640488238be40c25 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 9 Dec 2002 09:03:25 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 5 +++++ lisp/nntp.el | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16f7f68..fa0bfee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-12-09 Kai Gro,A_(Bjohann + + * nntp.el (nntp-send-command): Braino in last commit. Replace + `and' with `or'. + 2002-12-08 Kai Gro,A_(Bjohann * 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 --- 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) -- 1.7.10.4