[gnus git] branch master updated: n0-13-34-g63be035

       via  63be035adb3071702f15ba818aeccaff715e1134 (commit)
       via  8cae1da7c0f091e18298a529a7dde48ba7e14727 (commit)
      from  dd2e73903175c6fbecaa3cfd673c5db527d5af43 (commit)


- Log -----------------------------------------------------------------
commit 63be035adb3071702f15ba818aeccaff715e1134
Merge: 8cae1da dd2e739
Author: Ted Zlatanov <[email protected]>
Date:   Wed Feb 23 09:10:09 2011 -0600

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


commit 8cae1da7c0f091e18298a529a7dde48ba7e14727
Author: Ted Zlatanov <[email protected]>
Date:   Wed Feb 23 09:04:58 2011 -0600

    Fix up the creation defaults.
    
    * auth-source.el (auth-source-netrc-create): Use the default passed
    from above (given-default) or the built-in (user-login-name for
    :user).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8c543b..0d07c26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,7 +5,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  <[email protected]>
 
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 3081bc2..1db6b56 100644
--- 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

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    3 ++-
 lisp/auth-source.el |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project