diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-02-05 20:05:43 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-02-05 20:05:43 -0800 |
| commit | 79b6e0a971a3c3f56092e0d33aac43fbd0e3eef1 (patch) | |
| tree | dd73a7d61b01480e35ffb219c26829bc71f38757 | |
| parent | 36a672f6b030e89202210aa15013b34f545877dc (diff) | |
| download | emacs-79b6e0a971a3c3f56092e0d33aac43fbd0e3eef1.tar.gz | |
Some doc for epa-mail-aliases
* doc/misc/epa.texi (Mail-mode integration): Mention epa-mail-aliases.
* lisp/epa.el (epa-mail-aliases): Doc fix.
* etc/NEWS: Related edit.
| -rw-r--r-- | doc/misc/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/misc/epa.texi | 5 | ||||
| -rw-r--r-- | etc/NEWS | 5 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/epa.el | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 739d6938f0c..7242110ec0f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,7 @@ 2014-02-06 Glenn Morris <rgm@gnu.org> + * epa.texi (Mail-mode integration): Mention epa-mail-aliases. + * mh-e.texi, viper.texi: Do not use colons in index entries. 2014-02-05 Paul Eggert <eggert@cs.ucla.edu> diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index 4c4bbba8017..4dbc1373d32 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -342,11 +342,14 @@ Compose a signed message from the current buffer. @kindex @kbd{C-c C-e C-e} @kindex @kbd{C-c C-e e} @findex epa-mail-encrypt +@vindex epa-mail-aliases Compose an encrypted message from the current buffer. By default it tries to build the recipient list from @samp{to}, @samp{cc}, and @samp{bcc} fields of the mail header. To include your key in the recipient list, use @samp{encrypt-to} option in -@file{~/.gnupg/gpg.conf}. +@file{~/.gnupg/gpg.conf}. This function translates recipient +addresses using the @code{epa-mail-aliases} list. You can also +use that option to ignore specific recipients for encryption purposes. @end table @@ -517,9 +517,10 @@ You can customize `electric-pair-text-pairs' and `electric-pair-text-syntax-table' to tweak pairing behavior inside strings and comments. ++++ ** New EPA option `epa-mail-aliases'. -You can set this to a list of email address aliases for keys to use -in `epa-mail-encrypt'. +You can set this to a list of email address aliases that `epa-mail-encrypt' +should use to find keys. --- ** New ERC option `erc-accidental-paste-threshold-seconds'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 571f9547279..1a1a7031b8c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-02-06 Glenn Morris <rgm@gnu.org> + + * epa.el (epa-mail-aliases): Doc fix. + 2014-02-06 Dmitry Gutov <dgutov@yandex.ru> * emacs-lisp/lisp.el (lisp-completion-at-point): Use diff --git a/lisp/epa.el b/lisp/epa.el index ec1c0387bee..be439ef241d 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -57,7 +57,9 @@ instead of encrypting it for ALIAS, encrypt it for EXPANSIONS... If EXPANSIONS is empty, ignore ALIAS as regards encryption. This is a handy way to avoid warnings about addresses that you don't -have any key for." +have any key for. + +The command `epa-mail-encrypt' uses this." :type '(repeat (cons (string :tag "Alias") (repeat (string :tag "Expansion")))) :group 'epa :version "24.4") |