Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/net/netrc.el Thu May 22 04:26:41 2008 +0000 +++ b/lisp/net/netrc.el Thu May 22 05:03:00 2008 +0000 @@ -137,8 +137,10 @@ (while (and result (not (netrc-port-equal (or port defaultport "nntp") + ;; when port is not given in the netrc file, + ;; it should mean "any port" (or (netrc-get (car result) "port") - defaultport "nntp")))) + defaultport port)))) (pop result)) (car result)))) @@ -159,7 +161,7 @@ (dolist (default defaults) (dolist (port ports) (let ((alist (netrc-machine authinfo-list machine port default))) - (setq info (or (netrc-get alist mode) info)))))) + (setq info (or (netrc-get alist mode) info)))))) info)) (defun netrc-get (alist type)