X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fnntp.el;h=aa34293f5b13cde066d1cd9496a10c6af9c699fd;hb=f93b46ad7c665d1b8dc44718251ed75281919cfe;hp=e6bd05b23178c6a274b63d293fa9f48596fded52;hpb=3a5a9d0f4fd91421164242d45a5f4f7c872ac240;p=gnus

diff --git a/lisp/nntp.el b/lisp/nntp.el
index e6bd05b23..aa34293f5 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -90,6 +90,21 @@ Indirect connections:
 - `nntp-open-via-rlogin-and-netcat',
 - `nntp-open-via-telnet-and-telnet'.")
 
+(defvoo nntp-never-echoes-commands nil
+  "*Non-nil means the nntp server never echoes commands.
+It is reported that some nntps server doesn't echo commands.  So, you
+may want to set this to non-nil in the method for such a server setting
+`nntp-open-connection-function' to `nntp-open-ssl-stream' for example.
+Note that the `nntp-open-connection-functions-never-echo-commands'
+variable overrides the nil value of this variable.")
+
+(defvoo nntp-open-connection-functions-never-echo-commands
+    '(nntp-open-network-stream)
+  "*List of functions that never echo commands.
+Add or set a function which you set to `nntp-open-connection-function'
+to this list if it does not echo commands.  Note that a non-nil value
+of the `nntp-never-echoes-commands' variable overrides this variable.")
+
 (defvoo nntp-pre-command nil
   "*Pre-command to use with the various nntp-open-via-* methods.
 This is where you would put \"runsocks\" or stuff like that.")
@@ -479,12 +494,15 @@ be restored and the command retried."
 				nntp-server-buffer
 				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' or `nntp-open-ssl-stream',
-	  ;; so we skip this in that cases.
+	  ;; We don't have echoes if `nntp-never-echoes-commands' is non-nil
+	  ;; or the value of `nntp-open-connection-function' is in
+	  ;; `nntp-open-connection-functions-never-echo-commands', so we
+	  ;; skip this in that cases.
 	  (unless (or wait-for
-		      (memq nntp-open-connection-function
-			    '(nntp-open-network-stream nntp-open-ssl-stream)))
+		      nntp-never-echoes-commands
+		      (memq
+		       nntp-open-connection-function
+		       nntp-open-connection-functions-never-echo-commands))
 	    (nntp-accept-response)
 	    (save-excursion
 	      (set-buffer buffer)