From d6c03feadbb790d77f18d1e865164cd7fa603ae7 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 14 Feb 2007 03:24:32 +0000 Subject: [PATCH] (nntp-send-command): Don't wait for echoes when nntp-open-ssl-stream is used. --- lisp/ChangeLog | 5 +++++ lisp/nntp.el | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 215b9ef92..c7418bd10 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-02-14 Micha,Ak(Bl Cadilhac + + * nntp.el (nntp-send-command): Don't wait for echoes when + nntp-open-ssl-stream is used. + 2007-02-13 Katsumi Yamaoka * gnus-cite.el (gnus-test-font-lock-add-keywords) diff --git a/lisp/nntp.el b/lisp/nntp.el index f35f1c3b4..e6bd05b23 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -480,18 +480,18 @@ be restored and the command retried." wait-for nnheader-callback-function) ;; 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. + ;; is `nntp-open-network-stream' or `nntp-open-ssl-stream', + ;; so we skip this in that cases. (unless (or wait-for - (equal nntp-open-connection-function - 'nntp-open-network-stream)) + (memq nntp-open-connection-function + '(nntp-open-network-stream nntp-open-ssl-stream))) (nntp-accept-response) (save-excursion (set-buffer buffer) (goto-char pos) (if (looking-at (regexp-quote command)) (delete-region pos (progn (forward-line 1) - (point-at-bol)))) - ))) + (point-at-bol))))))) (nnheader-report 'nntp "Couldn't open connection to %s." nntp-address)))) -- 2.25.1