[gnus git] branch mml-refactoring updated: m0-13-108-gb28b097 =6= * mml-sec.el (mml-secure-cust-record-keys): Make gnus-union use `equal' to compare items in lists. ; Merge branch 'master' into mml-refactoring ; Fix `gnus-union' so as to behave like `cl-union' ; auth-source.el (auth-source-ensure-strings): Don't make a list out of 't' (Bug#22188) ; dgnushack.el (byte-optimize-apply): Fix last commit ; dgnushack.el (byte-optimize-apply): Make the use-mapcan advice work for (function nconc) as well as (quote nconc).
Jens Lechtenboerger <[email protected]> Sun, 27 Dec 2015 15:54:41 +0100
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via b28b09775d1b7099073ea2265fa114723cca66a1 (commit)
via abb91823ab6926a63957230431a2519fe0592663 (commit)
via ac9f01c45db8c08ffa835bbcdc2662ed14f40a73 (commit)
via 386e4d3ea54d4898bd5c7447991a116a1ef2c11f (commit)
via 239a1dbe33e801128b62b9f2cda70e6227c42a8b (commit)
via e1f185f9105db5ef945c731ff6ca347ed3704adf (commit)
from 2d3d778b406e905202296cd67188fb0e7bd435eb (commit)
- Log -----------------------------------------------------------------
commit b28b09775d1b7099073ea2265fa114723cca66a1
Author: Jens Lechtenboerger <[email protected]>
Date: Sun Dec 27 15:49:18 2015 +0100
* mml-sec.el (mml-secure-cust-record-keys):
Make gnus-union use `equal' to compare items in lists.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b54ef8b..70f7618 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-27 Jens Lechtenboerger <[email protected]>
+
+ * mml-sec.el (mml-secure-cust-record-keys):
+ Make gnus-union use `equal' to compare items in lists.
+
2015-12-23 Katsumi Yamaoka <[email protected]>
Fix `gnus-union' so as to behave like `cl-union'.
diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 142c4bb..cd6797d 100644
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -503,7 +503,7 @@ Return keys."
(let* ((usage-prefs (mml-secure-cust-usage-lookup context usage))
(curr-fprs (cdr (assoc name (cdr usage-prefs))))
(key-fprs (mapcar 'mml-secure-fingerprint keys))
- (new-fprs (gnus-union curr-fprs key-fprs)))
+ (new-fprs (gnus-union curr-fprs key-fprs :test 'equal)))
(if curr-fprs
(setcdr (assoc name (cdr usage-prefs)) new-fprs)
(setcdr usage-prefs (cons (cons name new-fprs) (cdr usage-prefs))))
commit abb91823ab6926a63957230431a2519fe0592663
Merge: 2d3d778 ac9f01c
Author: Jens Lechtenboerger <[email protected]>
Date: Sun Dec 27 15:42:28 2015 +0100
Merge branch 'master' into mml-refactoring
Conflicts:
lisp/ChangeLog
diff --cc lisp/ChangeLog
index 38e93cb,058e47a..b54ef8b
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,110 -1,22 +1,129 @@@
+ 2015-12-23 Katsumi Yamaoka <[email protected]>
+
+ Fix `gnus-union' so as to behave like `cl-union'.
+
+ * gnus-group.el (gnus-group-prepare-flat):
+ Make gnus-union use `equal' to compare items in lists.
+
+ * gnus-util.el (gnus-union): Make it behave like cl-union partially.
+
+ 2015-12-17 Eli Zaretskii <[email protected]>
+
+ * auth-source.el (auth-source-ensure-strings):
+ Don't make a list out of 't'. (Bug#22188)
+
+2015-12-17 Jens Lechtenboerger <[email protected]>
+
+ * gnustest-mml-sec.el: Remove require cl.
+
2015-12-16 Katsumi Yamaoka <[email protected]>
+
+ * dgnushack.el (byte-optimize-apply): Make the use-mapcan advice work
+ for (function nconc) as well as (quote nconc).
+
++2015-12-16 Katsumi Yamaoka <[email protected]>
+
+ * mml-sec.el (mml-secure-smime-sign-with-sender): Remove duplicate.
+ (mml-secure-cust-record-keys): Use gnus-union instead of cl-union.
+ (mml1991-cache-passphrase, mml1991-passphrase-cache-expiry):
+ Suppress byte-compile warning for old (X)Emacsen.
+ (mml-secure-check-sub-key):
+ Use gnus-string-match-p instead of string-match-p.
+ (mml-secure-select-preferred-keys):
+ Don't use mapcan that is a cl runtime function.
+
+ * mml-smime.el (mml-smime-cache-passphrase)
+ (mml-smime-passphrase-cache-expiry):
+ * mml1991.el (mml1991-cache-passphrase)
+ (mml1991-passphrase-cache-expiry):
+ * mml2015.el (mml2015-cache-passphrase)
+ (mml2015-passphrase-cache-expiry):
+ Fix version that indicates when those variables were made obsolete.
+
+2015-12-13 Jens Lechtenboerger <[email protected]>
+
+ Refactor mml-smime.el, mml1991.el, mml2015.el
+
+ Cf. discussion on ding mailing list, messages in
+ <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
+ Common code from the three files mml-smime.el, mml1991.el, and
+ mml2015.el is moved to mml-sec.el. Auxiliary functions are added
+ to gnus-util.el.
+
+ The code is supported by test cases with necessary test keys.
+
+ Documentation in message.texi is updated.
+
+ * gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
+ New functions.
+
+ * mml-sec.el: Require gnus-util and epg.
+ (epa--select-keys): Autoload.
+ (mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
+ (mml-secure-openpgp-signers): New user option;
+ make mml1991-signers and mml2015-signers obsolete aliases to it.
+ (mml-secure-smime-signers): New user option;
+ make mml-smime-signers an obsolete alias to it.
+ (mml-secure-openpgp-encrypt-to-self): New user option;
+ make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
+ aliases to it.
+ (mml-secure-smime-encrypt-to-self): New user option;
+ make mml-smime-encrypt-to-self an obsolete alias to it.
+ (mml-secure-openpgp-sign-with-sender): New user option;
+ make mml2015-sign-with-sender an obsolete alias to it.
+ (mml-secure-smime-sign-with-sender): New user option;
+ make mml-smime-sign-with-sender an obsolete alias to it.
+ (mml-secure-openpgp-always-trust): New user option;
+ make mml2015-always-trust an obsolete alias to it.
+ (mml-secure-fail-when-key-problem, mml-secure-key-preferences):
+ New user options.
+ (mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
+ (mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
+ (mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
+ (mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
+ (mml-secure-passphrase-callback, mml-secure-check-user-id)
+ (mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
+ (mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
+ (mml-secure-fingerprint, mml-secure-filter-keys)
+ (mml-secure-normalize-cust-name, mml-secure-select-keys)
+ (mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
+ (mml-secure-self-recipients, mml-secure-recipients)
+ (mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
+
+ * mml-smime.el: Require epg;
+ refactor declaration and autoloading of epg functions.
+ (mml-smime-use): Doc fix.
+ (mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
+ Obsolete.
+ (mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
+ Use format instead of gnus-format-message.
+ (mml-smime-epg-secret-key-id-list): Remove variable.
+ (mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
+ (mml-smime-epg-find-usable-secret-key): Remove functions.
+ (mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
+
+ * mml1991.el (mml1991-cache-passphrase)
+ (mml1991-passphrase-cache-expiry): Obsolete.
+ (mml1991-epg-secret-key-id-list): Remove variable.
+ (mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
+ (mml1991-epg-find-usable-secret-key): Remove functions.
+ (mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
+
+ * mml2015.el (mml2015-cache-passphrase)
+ (mml2015-passphrase-cache-expiry): Obsolete.
+ (mml2015-epg-secret-key-id-list): Remove variable.
+ (mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
+ (mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
+ (mml2015-epg-find-usable-secret-key): Remove functions.
+ (mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
+ (mml2015-epg-encrypt): Refactor.
+
+ * tests/gnustest-gnus-util.el:
+ * tests/gnustest-mml-sec.README:
+ * tests/gnustest-mml-sec.el:
+ * tests/mml-gpghome/gpg-agent.conf:
+ * tests/mml-gpghome/trustlist.txt: New files.
+
2015-12-04 Daiki Ueno <[email protected]>
* qp.el (quoted-printable-encode-region): Bind `case-fold-search' to
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 24 ++++++++++++++++++++++++
lisp/auth-source.el | 16 +++++++++-------
lisp/dgnushack.el | 2 +-
lisp/gnus-group.el | 3 ++-
lisp/gnus-util.el | 19 +++++++++++++------
lisp/mml-sec.el | 2 +-
6 files changed, 50 insertions(+), 16 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, mml-refactoring has been updated
hooks/post-receive
--
Gnus Project