Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 717098d..c7ea239 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,7 +11,8 @@
        (auth-source-netrc-element-or-first): New function to DTRT for
        parameter extraction.
        (auth-source-netrc-create): Use it and fix multiple parameter print
-       bug.
+       bug.  Use the default passed from above (given-default) or the
+       built-in (user-login-name for :user).
 
 2011-02-23  Lars Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 3081bc2..1db6b56 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -977,16 +977,19 @@ See `auth-source-search' for details on SPEC."
                                      (or
                                       (auth-source-netrc-element-or-first
                                        (aget valist 'user))
+                                      (plist-get artificial :user)
                                       "[any user]")
                                      (or
                                       (auth-source-netrc-element-or-first
                                        (aget valist 'host))
+                                      (plist-get artificial :host)
                                       "[any host]")
                                      (or
                                       (auth-source-netrc-element-or-first
                                        (aget valist 'port))
+                                      (plist-get artificial :port)
                                       "[any port]"))))
-               (t data)))
+               (t (or data default))))
 
         (when data
           (setq artificial (plist-put artificial