summaryrefslogtreecommitdiff
path: root/lisp/gnus/nntp.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-03-01 23:41:53 +0000
committerMiles Bader <miles@gnu.org>2007-03-01 23:41:53 +0000
commit45cb30ee1effd292cb89a54e08a9bba9fb40d4c1 (patch)
treef826153590a609989e05264b517e420c2e769bce /lisp/gnus/nntp.el
parent848e4bca7660a5768ff63743cb5402ce7d57ad81 (diff)
downloademacs-45cb30ee1effd292cb89a54e08a9bba9fb40d4c1.tar.gz
emacs-45cb30ee1effd292cb89a54e08a9bba9fb40d4c1.tar.bz2
emacs-45cb30ee1effd292cb89a54e08a9bba9fb40d4c1.zip
Merge from gnus--rel--5.10
Patches applied: * gnus--rel--5.10 (patch 203-205) - Merge from emacs--devo--0 - Update from CVS 2007-02-28 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/message.el (message-make-in-reply-to): Quote name containing non-ASCII characters. It will make the RFC2047 encoder cause an error if there are special characters. Reported by NAKAJI Hiroyuki <nakaji@kankyo-u.ac.jp>. 2007-02-27 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/nntp.el (nntp-never-echoes-commands) (nntp-open-connection-functions-never-echo-commands): New variables. (nntp-send-command): Use them. 2007-02-27 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (NNTP): Mention nntp-never-echoes-commands and nntp-open-connection-functions-never-echo-commands. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-658
Diffstat (limited to 'lisp/gnus/nntp.el')
-rw-r--r--lisp/gnus/nntp.el27
1 files changed, 23 insertions, 4 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 867ea5419f2..25b924a93e7 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -88,6 +88,21 @@ Indirect connections:
- `nntp-open-via-rlogin-and-telnet',
- `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.")
@@ -450,11 +465,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', so we skip this in that case.
+ ;; 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
- (equal nntp-open-connection-function
- 'nntp-open-network-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)