X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnimap.el;h=3dbe025d62b48b3822d9a8abf3096b2731d933e0;hp=45f794626a6ce58e82d4a0ad40ff5779fd1a931b;hb=a2967a1804e348afd1e419437e4c99a31ce9bb64;hpb=010053aacca25dd0495e3bf90e897f98da9600da

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 45f794626..3dbe025d6 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -73,6 +73,9 @@
 
 (eval-when-compile (require 'cl))
 
+(eval-and-compile
+  (autoload 'auth-source-user-or-password "auth-source"))
+
 (nnoo-declare nnimap)
 
 (defconst nnimap-version "nnimap 1.0")
@@ -798,22 +801,26 @@ If EXAMINE is non-nil the group is selected read-only."
  	   (port (if nnimap-server-port
  		     (int-to-string nnimap-server-port)
  		   "imap"))
-	   (user (netrc-machine-user-or-password
-		  "login"
-		  list
-		  (list server
-			(or nnimap-server-address
-			    nnimap-address))
-		  (list port)
-		  (list "imap" "imaps" "143" "993")))
-	   (passwd (netrc-machine-user-or-password
-		    "password"
-		    list
-		    (list server
-			  (or nnimap-server-address
-			      nnimap-address))
-		    (list port)
-		    (list "imap" "imaps" "143" "993"))))
+	   (user (or 
+		  (auth-source-user-or-password "login" server port) ; this is preferred to netrc-*
+		  (netrc-machine-user-or-password
+		   "login"
+		   list
+		   (list server
+			 (or nnimap-server-address
+			     nnimap-address))
+		   (list port)
+		   (list "imap" "imaps" "143" "993"))))
+	   (passwd (or 
+		    (auth-source-user-or-password "login" server port) ; this is preferred to netrc-*
+		    (netrc-machine-user-or-password
+		     "password"
+		     list
+		     (list server
+			   (or nnimap-server-address
+			       nnimap-address))
+		     (list port)
+		     (list "imap" "imaps" "143" "993")))))
       (if (imap-authenticate user passwd nnimap-server-buffer)
 	  (prog2
 	      (setq nnimap-server-buffer-alist