diff options
| author | Miles Bader <miles@gnu.org> | 2009-02-05 02:34:34 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2009-02-05 02:34:34 +0000 |
| commit | 3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22 (patch) | |
| tree | c2ca87dc1f8bb06d2b0608ef939d51f0b28e5d2e /lisp/gnus/nnimap.el | |
| parent | a9e2203dea54ba2d777e0df0415f65bb105272f1 (diff) | |
| download | emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.tar.gz emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.tar.bz2 emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.zip | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1537
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 87edde6a77b..cfcad522b45 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -805,8 +805,12 @@ If EXAMINE is non-nil the group is selected read-only." (port (if nnimap-server-port (int-to-string nnimap-server-port) "imap")) + (auth-info + (auth-source-user-or-password '("login" "password") server port)) + (auth-user (nth 0 auth-info)) + (auth-passwd (nth 1 auth-info)) (user (or - (auth-source-user-or-password "login" server port) ; this is preferred to netrc-* + auth-user ; this is preferred to netrc-* (netrc-machine-user-or-password "login" list @@ -816,7 +820,7 @@ If EXAMINE is non-nil the group is selected read-only." (list port) (list "imap" "imaps" "143" "993")))) (passwd (or - (auth-source-user-or-password "password" server port) ; this is preferred to netrc-* + auth-passwd ; this is preferred to netrc-* (netrc-machine-user-or-password "password" list |