nnimap.el: Handle plain value for nnimap-stream

* lisp/nnimap.el (nnimap-open-connection-1): Always query capabilities,
  so that a 'plain value for the `nnimap-stream' server variable is
  handled correctly.
* texi/gnus.texi: Document the 'plain option.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86ed0f4..652c52b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-09  Nikolaus Rath  <Nikolaus@rath.org>
+
+        * lisp/nnimap.el (nnimap-open-connection-1): Always query capabilities,
+       so that a 'plain value for the `nnimap-stream' server variable is
+       handled correctly.
+        * texi/gnus.texi: Document the 'plain option.
+
 2015-07-08  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
        Remove unused let variables

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 40610e1..8eb6268 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/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

diff --git a/texi/gnus.texi b/texi/gnus.texi
index b190184..97673ea 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/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