Search the netrc entries for the logical server name, then the actual.

* nnimap.el (nnimap-open-connection-1): `auth-source-search' for the
`nnoo-current-server' first, then for the actual `nnimap-address' to
allow netrc entries for the nnoo server to coexist with netrc entries
for the `nnimap-address'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf1d4ff..87ff855 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-29  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * nnimap.el (nnimap-open-connection-1): `auth-source-search' for the
+       `nnoo-current-server' first, then for the actual `nnimap-address' to
+       allow netrc entries for the nnoo server to coexist with netrc entries
+       for the `nnimap-address'.
+
 2013-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-dissect-buffer): Revert last change.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8c2b24..2220c81 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -456,8 +456,8 @@ textual parts.")
                                (nnimap-credentials
                                (gnus-delete-duplicates
                                 (list
-                                 nnimap-address
-                                 (nnoo-current-server 'nnimap)))
+                                  (nnoo-current-server 'nnimap)
+                                 nnimap-address))
                                 ports
                                 nnimap-user))))
                  (setq nnimap-object nil)