From 551123e0b272c967b8cd042df39947c0f8ad4b40 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Mon, 20 Jul 2020 14:39:25 +0200 Subject: [PATCH 1/2] * etc/NEWS: Correct description of :client-certificate change --- etc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index 10a6e3946e7..2c8fa9dd397 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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'. From 2c0c613ec55051f7e7ecb2301a8d10a5a077590b Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Mon, 20 Jul 2020 14:47:43 +0200 Subject: [PATCH 2/2] Document prefix arg effects for 'epa-mail-{sign,encrypt}' * doc/misc/epa.texi (Mail-mode integration): Describe effect of prefix arg to 'epa-mail-encrypt' and 'epa-mail-sign'. * lisp/epa-mail.el (epa-mail-sign): Describe effect of prefix arg. --- doc/misc/epa.texi | 5 ++++- lisp/epa-mail.el | 5 ++++- 2 files changed, 8 insertions(+), 2 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 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