Mercurial > emacs

diff lisp/gnus/nntp.el @ 111872:a264bb877bc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes made in Gnus trunk. nnir.el (nnir-request-expire-articles): Only allow article deletion. message.el (message-bogus-recipient-p): Set address to "" if nil. gnus-gravatar.el (gnus-gravatar-transform-address): Fix error when email address is nil. proto-stream.el (proto-stream-open-network-only): New function to have a way to specify non-STARTTLS upgrade connections.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 11 Dec 2010 01:27:14 +0000
parents 79219ca01c7b
children 417b1e4d63cd
line wrap: on
line diff
--- a/lisp/gnus/nntp.el	Fri Dec 10 23:42:17 2010 +0100
+++ b/lisp/gnus/nntp.el	Sat Dec 11 01:27:14 2010 +0000
@@ -87,6 +87,8 @@
 
 Direct connections:
 - `nntp-open-network-stream' (the default),
+- `network-only' (the same as the above, but don't do automatic
+  STARTTLS upgrades).
 - `nntp-open-ssl-stream',
 - `nntp-open-tls-stream',
 - `nntp-open-netcat-stream'.
@@ -1267,6 +1269,7 @@
 	      (let ((coding-system-for-read nntp-coding-system-for-read)
 		    (coding-system-for-write nntp-coding-system-for-write)
 		    (map '((nntp-open-network-stream network)
+			   (network-only network-only)
 			   (nntp-open-ssl-stream tls)
 			   (nntp-open-tls-stream tls))))
 		(if (assoc nntp-open-connection-function map)