From: Ted Zlatanov Date: Tue, 29 Oct 2013 13:54:16 +0000 (+0000) Subject: lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, then the... X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1090 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bdb7b45fcfd554b278a1412eedc360e591e6e72;p=emacs.git lisp/gnus/nnimap.el: Search the netrc entries for the logical server name, then the actual --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 92e3d8ff5c5..beb47120241 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2013-10-29 Teodor Zlatanov + + * 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 * mm-decode.el (mm-dissect-buffer): Revert last change. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index f8c2b24cc9f..2220c81e775 100644 --- 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)