[Emacs-diffs] /srv/bzr/emacs/trunk r101370: nnimap.el (nnimap-open-connection): Revert the change that would look into authinfo for imaps instead of imap.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101370
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-06 00:33:15 +0000
message:
  nnimap.el (nnimap-open-connection): Revert the change that would look into 
authinfo for imaps instead of imap.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-06 00:20:42 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-06 00:33:15 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2010-09-06 00:06:55 +0000
+++ b/lisp/gnus/nnimap.el       2010-09-06 00:33:15 +0000
@@ -833,13 +833,9 @@
     (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))