diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-07-20 17:31:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-07-20 17:31:50 +0300 |
| commit | cd93debc600b31ec7d257ba0195ae7132df83816 (patch) | |
| tree | 5fcf49e29401ccb47610f3b74f1468f3fc549a91 | |
| parent | 05c4329cf59f8bde98e33952c1f26551de83e400 (diff) | |
| parent | 2c0c613ec55051f7e7ecb2301a8d10a5a077590b (diff) | |
| download | emacs-cd93debc600b31ec7d257ba0195ae7132df83816.tar.gz | |
Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
| -rw-r--r-- | doc/misc/epa.texi | 5 | ||||
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/epa-mail.el | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index 49b6b53c0c4..fa1833a3da6 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -337,7 +337,8 @@ Verify OpenPGP cleartext signed messages in the current buffer. @kindex C-c C-e C-s @kindex C-c C-e s @findex epa-mail-sign -Compose a signed message from the current buffer. +Compose a signed message from the current buffer, using your default +key. With a prefix argument, select the key to use interactively. @item C-c C-e C-e and C-c C-e e @kindex C-c C-e C-e @@ -352,6 +353,8 @@ key in the recipient list, use @samp{encrypt-to} option in addresses using the @code{epa-mail-aliases} list. You can also use that option to ignore specific recipients for encryption purposes. +With prefix argument, asks you to select the recipients interactively, +whether to sign, and which key(s) to sign with. @end table @node Encrypting/decrypting gpg files, , Mail-mode integration, Commands @@ -270,7 +270,7 @@ doing before changing the value. +++ ** Native GnuTLS connections can now use client certificates. Previously, this support was only available when using the external -'gnutls-cli' command. Call 'open-network-stream' with +'gnutls-cli' or 'starttls' command. Call 'open-network-stream' with ':client-certificate t' to trigger looking up of per-server certificates via 'auth-source'. diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el index 00f560af0b7..63475256ca8 100644 --- a/lisp/epa-mail.el +++ b/lisp/epa-mail.el @@ -85,7 +85,10 @@ The buffer is expected to contain a mail message." ;;;###autoload (defun epa-mail-sign (start end signers mode) "Sign the current buffer. -The buffer is expected to contain a mail message." +The buffer is expected to contain a mail message, and signing is +performed with your default key. +With prefix argument, asks you to select interactively the key to +use from your key ring." (declare (interactive-only t)) (interactive (save-excursion |