Mercurial > emacs

diff lisp/gnus/nntp.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 6609f07cf9fd
line wrap: on
line diff
--- a/lisp/gnus/nntp.el	Wed Feb 04 23:05:26 2009 +0000
+++ b/lisp/gnus/nntp.el	Thu Feb 05 02:34:34 2009 +0000
@@ -1179,14 +1179,18 @@
   (let* ((list (netrc-parse nntp-authinfo-file))
 	 (alist (netrc-machine list nntp-address "nntp"))
 	 (force (or (netrc-get alist "force") nntp-authinfo-force))
+	 (auth-info 
+	  (auth-source-user-or-password '("login" "password") nntp-address "nntp"))
+	 (auth-user (nth 0 auth-info))
+	 (auth-passwd (nth 1 auth-info))
 	 (user (or
 		;; this is preferred to netrc-*
-		(auth-source-user-or-password "login" nntp-address "nntp")
+		auth-user
 		(netrc-get alist "login")
 		nntp-authinfo-user))
 	 (passwd (or
 		  ;; this is preferred to netrc-*
-		  (auth-source-user-or-password "password" nntp-address "nntp")
+		  auth-passwd
 		  (netrc-get alist "password"))))
     (when (or (not send-if-force)
 	      force)