[Emacs-diffs] /srv/bzr/emacs/trunk r109552: lisp/gnus/auth-source.el: (auth-source-plstore-search, auth-source-secrets-search): Ignore :require and :type in search spec

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 109552
author: Daiki Ueno <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-10 14:38:37 +0000
message:
  lisp/gnus/auth-source.el: (auth-source-plstore-search, 
auth-source-secrets-search): Ignore :require and :type in search spec
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-08-06 11:56:36 +0000
+++ b/lisp/gnus/ChangeLog       2012-08-10 14:38:37 +0000
@@ -1,3 +1,8 @@
+2012-08-10  Daiki Ueno  <address@hidden>
+
+       * auth-source.el: (auth-source-plstore-search)
+       (auth-source-secrets-search): Ignore :require and :type in search spec.
+
 2012-08-06  Julien Danjou  <address@hidden>
 
        * gnus-demon.el (gnus-demon-add-handler, gnus-demon-remove-handler):

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2012-07-29 22:17:54 +0000
+++ b/lisp/gnus/auth-source.el  2012-08-10 14:38:37 +0000
@@ -1532,7 +1532,7 @@
 
   (let* ((coll (oref backend source))
          (max (or max 5000))     ; sanity check: default to stop at 5K
-         (ignored-keys '(:create :delete :max :backend :label))
+         (ignored-keys '(:create :delete :max :backend :label :require :type))
          (search-keys (loop for i below (length spec) by 2
                             unless (memq (nth i spec) ignored-keys)
                             collect (nth i spec)))
@@ -1787,7 +1787,7 @@
   "Search the PLSTORE; spec is like `auth-source'."
   (let* ((store (oref backend data))
          (max (or max 5000))     ; sanity check: default to stop at 5K
-         (ignored-keys '(:create :delete :max :backend :require))
+         (ignored-keys '(:create :delete :max :backend :label :require :type))
          (search-keys (loop for i below (length spec) by 2
                             unless (memq (nth i spec) ignored-keys)
                             collect (nth i spec)))