[Emacs-diffs] /srv/bzr/emacs/trunk r101360: nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the .authinfo if we're using ssl connection.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101360
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2010-09-05 23:27:15 +0000
message:
  nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the 
.authinfo if we're using ssl connection.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-05 23:20:25 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-05 23:27:15 +0000
@@ -1,5 +1,8 @@
 2010-09-05  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the
+       .authinfo if we're using ssl connection.
+
        * nnvirtual.el (nnvirtual-create-mapping): Use the active info we
        already have if we're in a main Gnus `g' run.
 

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/nnimap.el       2010-09-05 23:27:15 +0000
@@ -832,9 +832,13 @@
     (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'."
                                      nnimap-authinfo-file)
                        (netrc-parse nnimap-authinfo-file)))
-          (port (if nnimap-server-port
-                    (int-to-string nnimap-server-port)
-                  "imap"))
+          (port (cond
+                 (nnimap-server-port
+                  (int-to-string nnimap-server-port))
+                 ((eq nnimap-stream 'ssl)
+                  "imaps")
+                 (t
+                  "imap")))
           (auth-info
            (auth-source-user-or-password '("login" "password") server port))
           (auth-user (nth 0 auth-info))