[gnus git] branch master updated: m0-7-240-g9910a6d =1= Search the netrc entries for the logical server name, then the actual.

       via  9910a6dc485cc75301c8e69913f92836b90f3b63 (commit)
      from  25bdaa526127e0c15ca299cadf1ebd3afcf5f873 (commit)


- Log -----------------------------------------------------------------
commit 9910a6dc485cc75301c8e69913f92836b90f3b63
Author: Ted Zlatanov <[email protected]>
Date:   Tue Oct 29 09:19:11 2013 -0400

    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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-29  Teodor Zlatanov  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* mm-decode.el (mm-dissect-buffer): Revert last change.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8c2b24..2220c81 100644
--- 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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    7 +++++++
 lisp/nnimap.el |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project