projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* nnmairix.el: Remove old documentation in the commentary block.
[gnus]
/
lisp
/
netrc.el
diff --git
a/lisp/netrc.el
b/lisp/netrc.el
index
e526242
..
80ae1b5
100644
(file)
--- a/
lisp/netrc.el
+++ b/
lisp/netrc.el
@@
-1,6
+1,6
@@
;;; netrc.el --- .netrc parsing functionality
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;;; netrc.el --- .netrc parsing functionality
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008
, 2009
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-158,11
+158,22
@@
MODE can be \"login\" or \"password\", suitable for passing to
(ports (or ports '(nil)))
(defaults (or defaults '(nil)))
info)
(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)
info))
(defun netrc-get (alist type)