(nntp-send-command): Don't wait for echoes when nntp-open-ssl-stream is used.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 215b9ef..c7418bd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-14  Micha\e,Ak\e(Bl Cadilhac  <michael@cadilhac.name>
+
+       * nntp.el (nntp-send-command): Don't wait for echoes when
+       nntp-open-ssl-stream is used.
+
 2007-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-cite.el (gnus-test-font-lock-add-keywords)

diff --git a/lisp/nntp.el b/lisp/nntp.el
index f35f1c3..e6bd05b 100644 (file)
--- 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))))