[Emacs-diffs] trunk r114841: lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, then the actual

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 114841
revision-id: address@hidden
parent: address@hidden
author: Ted Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-29 13:54:16 +0000
message:
  lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, 
then the actual
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/nnimap.el            nnimap.el-20091113204419-o5vbwnq5f7feedwu-1978

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-10-23 03:35:49 +0000
+++ b/lisp/gnus/ChangeLog       2013-10-29 13:54:16 +0000
@@ -1,3 +1,10 @@
+2013-10-29  Teodor Zlatanov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mm-decode.el (mm-dissect-buffer): Revert last change.

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2013-08-13 07:18:50 +0000
+++ b/lisp/gnus/nnimap.el       2013-10-29 13:54:16 +0000
@@ -456,8 +456,8 @@
                                (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)