[Emacs-diffs] Changes to emacs/lisp/gnus/nnimap.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/05/10 05:34:55

Index: nnimap.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnimap.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- nnimap.el   6 May 2008 03:55:07 -0000       1.44
+++ nnimap.el   10 May 2008 05:34:54 -0000      1.45
@@ -71,6 +71,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")
@@ -796,22 +799,26 @@
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
-          (user (netrc-machine-user-or-password
+          (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 (netrc-machine-user-or-password
+                  (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"))))
+                    (list "imap" "imaps" "143" "993")))))
       (if (imap-authenticate user passwd nnimap-server-buffer)
          (prog2
              (setq nnimap-server-buffer-alist