From 0bec5a22cea517a15cf7eb5674094b94d1a7ead8 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Thu, 9 Jul 2015 03:54:03 +0000 Subject: [PATCH] nnimap.el: Handle plain value for nnimap-stream * lisp/gnus/nnimap.el (nnimap-open-connection-1): Always query capabilities, so that a 'plain value for the `nnimap-stream' server variable is handled correctly. * doc/misc/gnus.texi (Customizing the IMAP Connection): Document the 'plain option. --- doc/misc/gnus.texi | 4 ++++ lisp/gnus/nnimap.el | 1 + 2 files changed, 5 insertions(+) diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index d801031c563..0afc7e47c4b 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -14252,6 +14252,10 @@ If you need to tunnel via other systems to connect to the server, you can use this option, and customize @code{nnimap-shell-program} to be what you need. +@item plain +Non-encrypted and unsafe straight socket connection. +@acronym{STARTTLS} will not be used even if it is available. + @end table @item nnimap-authenticator diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 40610e1d71a..8eb6268a140 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -423,6 +423,7 @@ textual parts.") :return-list t :shell-command nnimap-shell-program :capability-command "1 CAPABILITY\r\n" + :always-query-capabilities t :end-of-command "\r\n" :success " OK " :starttls-function -- 2.39.5