aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2011-02-17 05:09:02 +0000
committerKatsumi Yamaoka2011-02-17 05:09:02 +0000
commitd638ac9ecc2f2fcf7c000ef0aa237826f1a1cda1 (patch)
tree2a29e04e2e4927acba2928b166aa372faf1fedc9
parent64a14c74cb9792c3674fa8d9277e998b85ba3b30 (diff)
downloademacs-d638ac9ecc2f2fcf7c000ef0aa237826f1a1cda1.tar.gz
emacs-d638ac9ecc2f2fcf7c000ef0aa237826f1a1cda1.zip
auth-source.el (auth-source-secrets-search): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/auth-source.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5891d4b6193..c98c86d46f2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12011-02-17 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * auth-source.el (auth-source-secrets-search): Use mm-delete-duplicates
4 instead of delete-dups that is not available in XEmacs 21.4.
5
12011-02-16 Lars Ingebrigtsen <larsi@gnus.org> 62011-02-16 Lars Ingebrigtsen <larsi@gnus.org>
2 7
3 * gnus-sum.el (gnus-propagate-marks): Change default to t again, since 8 * gnus-sum.el (gnus-propagate-marks): Change default to t again, since
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 2b284e3729d..c3f0f2d5ba5 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -40,6 +40,7 @@
40;;; Code: 40;;; Code:
41 41
42(require 'password-cache) 42(require 'password-cache)
43(require 'mm-util)
43(require 'gnus-util) 44(require 'gnus-util)
44(require 'netrc) 45(require 'netrc)
45(require 'assoc) 46(require 'assoc)
@@ -1042,9 +1043,9 @@ authentication tokens:
1042 (list k (plist-get spec k)))) 1043 (list k (plist-get spec k))))
1043 search-keys))) 1044 search-keys)))
1044 ;; needed keys (always including host, login, protocol, and secret) 1045 ;; needed keys (always including host, login, protocol, and secret)
1045 (returned-keys (delete-dups (append 1046 (returned-keys (mm-delete-duplicates (append
1046 '(:host :login :protocol :secret) 1047 '(:host :login :protocol :secret)
1047 search-keys))) 1048 search-keys)))
1048 (items (loop for item in (apply 'secrets-search-items coll search-spec) 1049 (items (loop for item in (apply 'secrets-search-items coll search-spec)
1049 unless (and (stringp label) 1050 unless (and (stringp label)
1050 (not (string-match label item))) 1051 (not (string-match label item)))