aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Zlatanov2012-07-29 22:17:54 +0000
committerKatsumi Yamaoka2012-07-29 22:17:54 +0000
commitd6e7c17b31f74169fc787d02a36b15f17ba41f86 (patch)
tree43351152118790cea8c32e5d9ec8627f2a2fb053
parentd7fcec5d7d7b5c457dd6b44572f672c81691e171 (diff)
downloademacs-d6e7c17b31f74169fc787d02a36b15f17ba41f86.tar.gz
emacs-d6e7c17b31f74169fc787d02a36b15f17ba41f86.zip
lisp/gnus/auth-source.el: Fix last change
-rw-r--r--lisp/gnus/ChangeLog1
-rw-r--r--lisp/gnus/auth-source.el6
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9426b7889c8..f13ffb5afd7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -8,6 +8,7 @@
8 auth-source.el through the /usr/bin/security utility. 8 auth-source.el through the /usr/bin/security utility.
9 (auth-sources): Fix syntax error. 9 (auth-sources): Fix syntax error.
10 (auth-source-macos-keychain-result-append): Fix variable name. 10 (auth-source-macos-keychain-result-append): Fix variable name.
11 (auth-sources, auth-source-macos-keychain-result-append): More fixes.
11 12
122012-07-27 Julien Danjou <jd@dex.adm.naquadah.org> 132012-07-27 Julien Danjou <jd@dex.adm.naquadah.org>
13 14
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 87f09632250..79358b401b8 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -280,7 +280,7 @@ can get pretty complex."
280 :value :macos-keychain-internet) 280 :value :macos-keychain-internet)
281 (choice :tag "Collection to use" 281 (choice :tag "Collection to use"
282 (string :tag "internet Keychain path") 282 (string :tag "internet Keychain path")
283 (const :tag "default" 'default)))) 283 (const :tag "default" 'default)))
284 (list 284 (list
285 :tag "Mac OS generic Keychain" 285 :tag "Mac OS generic Keychain"
286 (const :format "" 286 (const :format ""
@@ -1757,7 +1757,7 @@ entries for git.gnus.org:
1757 (and (plist-get ret :secret) (list ret)))) 1757 (and (plist-get ret :secret) (list ret))))
1758 1758
1759(defun auth-source-macos-keychain-result-append (result generic k v) 1759(defun auth-source-macos-keychain-result-append (result generic k v)
1760 (push v ret) 1760 (push v result)
1761 (setq k (cond 1761 (setq k (cond
1762 ((equal k "acct") "user") 1762 ((equal k "acct") "user")
1763 ;; for generic keychains, creator is host, service is port 1763 ;; for generic keychains, creator is host, service is port
@@ -1768,7 +1768,7 @@ entries for git.gnus.org:
1768 ((and (not generic) (equal k "srvr")) "host") 1768 ((and (not generic) (equal k "srvr")) "host")
1769 (t k))) 1769 (t k)))
1770 1770
1771 (push (intern (format ":%s" k)) ret)) 1771 (push (intern (format ":%s" k)) result))
1772 1772
1773(defun* auth-source-macos-keychain-create (&rest 1773(defun* auth-source-macos-keychain-create (&rest
1774 spec 1774 spec