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/net/netrc.el | |
| parent | a9e2203dea54ba2d777e0df0415f65bb105272f1 (diff) | |
| download | emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.tar.gz | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1537
Diffstat (limited to 'lisp/net/netrc.el')
| -rw-r--r-- | lisp/net/netrc.el | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 9c7f0176ef8..80ae1b57ba3 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -158,11 +158,22 @@ MODE can be \"login\" or \"password\", suitable for passing to (ports (or ports '(nil))) (defaults (or defaults '(nil))) info) - (dolist (machine machines) - (dolist (default defaults) - (dolist (port ports) - (let ((alist (netrc-machine authinfo-list machine port default))) - (setq info (or (netrc-get alist mode) info)))))) + (if (listp mode) + (setq info + (mapcar + (lambda (mode-element) + (netrc-machine-user-or-password + mode-element + authinfo-list + machines + ports + defaults)) + mode)) + (dolist (machine machines) + (dolist (default defaults) + (dolist (port ports) + (let ((alist (netrc-machine authinfo-list machine port default))) + (setq info (or (netrc-get alist mode) info))))))) info)) (defun netrc-get (alist type) |