* auth-source.el (auth-sources, auth-source-macos-keychain-result-append): More fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2b8eb3..8591bd0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,7 @@
        auth-source.el through the /usr/bin/security utility.
        (auth-sources): Fix syntax error.
        (auth-source-macos-keychain-result-append): Fix variable name.
+       (auth-sources, auth-source-macos-keychain-result-append): More fixes.
 
 2012-07-27  Julien Danjou  <jd@dex.adm.naquadah.org>
 

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 360c866..c8810bc 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -290,7 +290,7 @@ can get pretty complex."
                                         :value :macos-keychain-internet)
                                  (choice :tag "Collection to use"
                                          (string :tag "internet Keychain path")
-                                         (const :tag "default" 'default))))
+                                         (const :tag "default" 'default)))
                                 (list
                                  :tag "Mac OS generic Keychain"
                                  (const :format ""
@@ -1767,7 +1767,7 @@ entries for git.gnus.org:
       (and (plist-get ret :secret) (list ret))))
 
 (defun auth-source-macos-keychain-result-append (result generic k v)
-  (push v ret)
+  (push v result)
   (setq k (cond
            ((equal k "acct") "user")
            ;; for generic keychains, creator is host, service is port
@@ -1778,7 +1778,7 @@ entries for git.gnus.org:
            ((and (not generic) (equal k "srvr")) "host")
            (t k)))
 
-  (push (intern (format ":%s" k)) ret))
+  (push (intern (format ":%s" k)) result))
 
 (defun* auth-source-macos-keychain-create (&rest
                                            spec