lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, then the actual

0bdb7b45 · Ted Zlatanov · Katsumi Yamaoka · 142207c0 · 0bdb7b45 · 0bdb7b45
Commit 0bdb7b45 authored Oct 29, 2013 by Ted Zlatanov Committed by Katsumi Yamaoka Oct 29, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +7 -0

lisp/gnus/nnimap.el lisp/gnus/nnimap.el +2 -2

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
+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.

--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/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)