Mercurial > emacs
comparison lisp/net/netrc.el @ 95193:d90ff358ee27
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1172
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 22 May 2008 05:03:00 +0000 |
parents | 91e5880a36c1 |
children | 164c226d4a0d |
comparison
equal
deleted
inserted
replaced
95192:042486c3318c | 95193:d90ff358ee27 |
---|---|
135 (when result | 135 (when result |
136 (setq result (nreverse result)) | 136 (setq result (nreverse result)) |
137 (while (and result | 137 (while (and result |
138 (not (netrc-port-equal | 138 (not (netrc-port-equal |
139 (or port defaultport "nntp") | 139 (or port defaultport "nntp") |
140 ;; when port is not given in the netrc file, | |
141 ;; it should mean "any port" | |
140 (or (netrc-get (car result) "port") | 142 (or (netrc-get (car result) "port") |
141 defaultport "nntp")))) | 143 defaultport port)))) |
142 (pop result)) | 144 (pop result)) |
143 (car result)))) | 145 (car result)))) |
144 | 146 |
145 (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines ports defaults) | 147 (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines ports defaults) |
146 "Get the user name or password according to MODE from AUTHINFO-FILE-OR-LIST. | 148 "Get the user name or password according to MODE from AUTHINFO-FILE-OR-LIST. |
157 info) | 159 info) |
158 (dolist (machine machines) | 160 (dolist (machine machines) |
159 (dolist (default defaults) | 161 (dolist (default defaults) |
160 (dolist (port ports) | 162 (dolist (port ports) |
161 (let ((alist (netrc-machine authinfo-list machine port default))) | 163 (let ((alist (netrc-machine authinfo-list machine port default))) |
162 (setq info (or (netrc-get alist mode) info)))))) | 164 (setq info (or (netrc-get alist mode) info)))))) |
163 info)) | 165 info)) |
164 | 166 |
165 (defun netrc-get (alist type) | 167 (defun netrc-get (alist type) |
166 "Return the value of token TYPE from ALIST." | 168 "Return the value of token TYPE from ALIST." |
167 (cdr (assoc type alist))) | 169 (cdr (assoc type alist))) |