Mercurial > emacs

diff lisp/net/netrc.el @ 101804:d775b84fdd71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1537
author Miles Bader <miles@gnu.org>
date Thu, 05 Feb 2009 02:34:34 +0000
parents a9dc0e7c3f2b
children 1d1d5d9bd884
line wrap: on
line diff
--- a/lisp/net/netrc.el	Wed Feb 04 23:05:26 2009 +0000
+++ b/lisp/net/netrc.el	Thu Feb 05 02:34:34 2009 +0000
@@ -158,11 +158,22 @@
 	(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)