nnimap.el (nnimap-open-connection): Revert the change that would look into authinfo...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0beb0bcb2e00ff2cda4f139eafc4ebb38804d5d5..45018de0e4f657072dc186712df707a191346f66 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-open-connection): Revert the change that would look
+       into authinfo for imaps instead of imap.
+
        * gnus-start.el (gnus-activate-group): Take an optional parameter to
        say that you don't want to call gnus-request-group with don-check, but
        do check the reponse.  This is for virtual groups only.

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e6a7f740d2310f46d046f475380f0a24bd157b12..d412af46d0c25ed243e6fd737b3c86b366953888 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -833,13 +833,9 @@ If EXAMINE is non-nil the group is selected read-only."
     (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'."
                                      nnimap-authinfo-file)
                        (netrc-parse nnimap-authinfo-file)))
-          (port (cond
-                 (nnimap-server-port
-                  (int-to-string nnimap-server-port))
-                 ((eq nnimap-stream 'ssl)
-                  "imaps")
-                 (t
-                  "imap")))
+          (port (if nnimap-server-port
+                    (int-to-string nnimap-server-port)
+                  "imap"))
           (auth-info
            (auth-source-user-or-password '("login" "password") server port))
           (auth-user (nth 0 auth-info))