Synch with Emacs trunk.

2010-06-15  Michael Albinus  <michael.albinus@gmx.de>
 * auth-source.el (auth-source-pick): If choice does not contain a
 questioned keyword, set the check to t.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d3211f..21ef7a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-15  Michael Albinus  <michael.albinus@gmx.de>
+
+       * auth-source.el (auth-source-pick): If choice does not contain a
+       questioned keyword, set the check to t.
+
 2010-06-12  Romain Francoise  <romain@orebokech.com>
 
        * gnus-util.el (gnus-date-get-time): Move up before first use.

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 89b2ef3..e43f09e 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -229,7 +229,8 @@ matched as a regex."
             ;; Check keywords.
             (dolist (k keys match)
               (let* ((v (plist-get spec k))
-                     (choicev (plist-get choice k)))
+                     (choicev (if (plist-member choice k)
+                                  (plist-get choice k) t)))
                 (setq match
                       (and match
                            (or