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.

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index d801031c563d6ac2fd3c6d401731f340c6119e05..0afc7e47c4be314606817f414df462ade356092c 100644 (file)
--- 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 40610e1d71a7ab753d23d7b3653e504c5b006ef6..8eb6268a140b1ad778be521347c04455d5f66af6 100644 (file)
--- 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