| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-07-29 22:14:30 (GMT) |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-07-29 22:14:30 (GMT) |
| commit | 361d0aad90fa93900be129ad1968f917d5401f44 (patch) (side-by-side diff) | |
| tree | 70559f243ef2aefa7cfdc99235d2a15fd0c49e3e | |
| parent | 6721251f6977b2979c369ad28981b83acc4d3301 (diff) | |
| parent | 3126bc20b0eb30ea691b99ba636deecc3d2772cd (diff) | |
| download | gnus-361d0aad90fa93900be129ad1968f917d5401f44.zip | |
Merge branch 'master' of https://git.gnus.org/gnus
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/auth-source.el | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2b8eb3..8591bd0 100644 --- 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 --- 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 |