diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-02-05 00:37:39 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-02-05 00:37:39 -0800 |
| commit | 451ea3e6cca50a905550a27b8b49bc6a8bff7a2b (patch) | |
| tree | dfc78251edd5b5925691e4e4278f989b734fa526 | |
| parent | 6222d672a5c5dd06023b424a07b39729dd9d4550 (diff) | |
| download | emacs-451ea3e6cca50a905550a27b8b49bc6a8bff7a2b.tar.gz emacs-451ea3e6cca50a905550a27b8b49bc6a8bff7a2b.tar.bz2 emacs-451ea3e6cca50a905550a27b8b49bc6a8bff7a2b.zip | |
* lisp/epa.el (epa-mail-aliases): Fic custom type. Doc tweak.
* etc/NEWS: Related edit.
| -rw-r--r-- | etc/NEWS | 13 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/epa.el | 11 |
3 files changed, 12 insertions, 16 deletions
@@ -518,17 +518,8 @@ You can customize `electric-pair-text-pairs' and strings and comments. ** New EPA option `epa-mail-aliases'. -You can set this to a list of alias expansions for keys to use -in `epa-mail-encrypt'. - -If one element of the variable's value is ("foo@bar.com" "foo@hello.org"), -that means: when one of the recipients of the message being encrypted -is `foo@bar.com', encrypt the message for `foo@hello.org' instead. - -If one element of the variable's value is ("foo@bar.com"), -that means: when one of the recipients of the message being encrypted -is `foo@bar.com', ignore that name as regards encryption. -This is useful to avoid a query when you have no key for that name. +You can set this to a list of email address aliases for keys to use +`epa-mail-encrypt'. --- ** New ERC option `erc-accidental-paste-threshold-seconds'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aee691b82c5..a74ffeda68b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-02-05 Glenn Morris <rgm@gnu.org> + + * epa.el (epa-mail-aliases): Fic custom type. Doc tweak. + 2014-02-04 Fabián Ezequiel Gallina <fgallina@gnu.org> * progmodes/python.el (python-shell-send-string): diff --git a/lisp/epa.el b/lisp/epa.el index 16cb5633512..ec1c0387bee 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -51,13 +51,14 @@ (defcustom epa-mail-aliases nil "Alist of aliases of email addresses that stand for encryption keys. -Each element is (ALIAS EXPANSIONS...). -It means that when a message is addressed to ALIAS, +Each element is a list of email addresses (ALIAS EXPANSIONS...). +When one of the recipients of a message being encrypted is ALIAS, instead of encrypting it for ALIAS, encrypt it for EXPANSIONS... + If EXPANSIONS is empty, ignore ALIAS as regards encryption. -That is a handy way to avoid warnings about addresses -that you don't have any key for." - :type '(repeat (cons (string :tag "Alias") (repeat '(string :tag "Expansion")))) +This is a handy way to avoid warnings about addresses that you don't +have any key for." + :type '(repeat (cons (string :tag "Alias") (repeat (string :tag "Expansion")))) :group 'epa :version "24.4") |