[Emacs-diffs] /srv/bzr/emacs/trunk r109277: lisp/gnus/auth-source.el: Fix last change

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 109277
author: Ted Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 22:17:54 +0000
message:
  lisp/gnus/auth-source.el: Fix last change
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-07-29 22:07:41 +0000
+++ b/lisp/gnus/ChangeLog       2012-07-29 22:17:54 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2012-07-29 22:07:41 +0000
+++ b/lisp/gnus/auth-source.el  2012-07-29 22:17:54 +0000
@@ -280,7 +280,7 @@
                                         :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 ""
@@ -1757,7 +1757,7 @@
       (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
@@ -1768,7 +1768,7 @@
            ((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