*** /home/albinus/lisp/auth-source.el.~1~	2011-01-25 13:55:05.000000000 +0100
--- /home/albinus/lisp/auth-source.el	2011-01-26 17:41:59.223404487 +0100
***************
*** 41,46 ****
--- 41,47 ----
  
  (require 'gnus-util)
  (require 'netrc)
+ (require 'assoc)
  (eval-when-compile (require 'cl))
  (eval-when-compile (require 'eieio))
  
***************
*** 93,104 ****
  
  ;;(auth-source-backend "netrc" :type 'netrc)
  
- (defcustom auth-source-do-cache t
-   "Whether auth-source should cache information."
-   :group 'auth-source
-   :version "23.2" ;; No Gnus
-   :type `boolean)
- 
  (defcustom auth-source-protocols '((imap "imap" "imaps" "143" "993")
                                     (pop3 "pop3" "pop" "pop3s" "110" "995")
                                     (ssh  "ssh" "22")
--- 94,99 ----
***************
*** 173,179 ****
  It's best to customize this with `M-x customize-variable' because the choices
  can get pretty complex."
    :group 'auth-source
!   :version "23.2" ;; No Gnus
    :type `(repeat :tag "Authentication Sources"
                   (choice
                    (string :tag "Just a file")
--- 168,174 ----
  It's best to customize this with `M-x customize-variable' because the choices
  can get pretty complex."
    :group 'auth-source
!   :version "24.1" ;; No Gnus
    :type `(repeat :tag "Authentication Sources"
                   (choice
                    (string :tag "Just a file")
***************
*** 216,222 ****
    "List of recipient keys that `authinfo.gpg' encrypted to.
  If the value is not a list, symmetric encryption will be used."
    :group 'auth-source
!   :version "23.2" ;; No Gnus
    :type '(choice (const :tag "Symmetric encryption" t)
                   (repeat :tag "Recipient public keys"
                           (string :tag "Recipient public key"))))
--- 211,217 ----
    "List of recipient keys that `authinfo.gpg' encrypted to.
  If the value is not a list, symmetric encryption will be used."
    :group 'auth-source
!   :version "24.1" ;; No Gnus
    :type '(choice (const :tag "Symmetric encryption" t)
                   (repeat :tag "Recipient public keys"
                           (string :tag "Recipient public key"))))
***************
*** 592,598 ****
  "Given a property list SPEC, return search matches from the :backend.
  See `auth-source-search' for details on SPEC."
    ;; just in case, check that the type is correct
!   (assert (eq type (oref backend type)))
  
    (let ((results (auth-source-netrc-normalize
                    (auth-source-netrc-parse
--- 587,593 ----
  "Given a property list SPEC, return search matches from the :backend.
  See `auth-source-search' for details on SPEC."
    ;; just in case, check that the type is correct
!   (assert (or (null type) (eq type (oref backend type))))
  
    (let ((results (auth-source-netrc-normalize
                    (auth-source-netrc-parse
***************
*** 860,866 ****
             host protocol username)
            found)                        ; return the found data
        ;; else, if not found
!       (let ((choices (apply 'auth-source-pick search)))
          (dolist (choice choices)
            (if delete-existing
                (apply 'auth-source-delete choice search)
--- 855,861 ----
             host protocol username)
            found)                        ; return the found data
        ;; else, if not found
!       (let ((choices (apply 'auth-source-search search)))
          (dolist (choice choices)
            (if delete-existing
                (apply 'auth-source-delete choice search)