nnimap.el, pop3.el: Make IMAP and POP3 warn unless encrypted

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d794d4a..d1e078b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * pop3.el (pop3-open-server): Warn unless encrypted.
+
+       * nnimap.el (nnimap-open-connection-1): Warn unless encrypted.
+
 2014-11-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port new time stamp handling to Emacs 23.2.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 7992151..45d10dd 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -405,6 +405,7 @@ textual parts.")
               "*nnimap*" (current-buffer) nnimap-address
               (nnimap-map-port (car ports))
               :type nnimap-stream
+              :warn-unless-encrypted t
               :return-list t
               :shell-command nnimap-shell-program
               :capability-command "1 CAPABILITY\r\n"

diff --git a/lisp/pop3.el b/lisp/pop3.el
index dfc646b..64a704f 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -561,6 +561,7 @@ Returns the process associated with the connection."
                     'tls)
                    (t
                     (or pop3-stream-type 'network)))
+            :warn-unless-encrypted t
             :capability-command "CAPA\r\n"
             :end-of-command "^\\(-ERR\\|+OK\\).*\n"
             :end-of-capability "^\\.\r?\n\\|^-ERR"