From: Robert Pluim <rpluim@gmail.com>
Date: Mon, 20 Jul 2020 12:47:43 +0000 (+0200)
Subject: Document prefix arg effects for 'epa-mail-{sign,encrypt}'
X-Git-Tag: emacs-27.1-rc1~25^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c0c613ec5;p=emacs.git

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.
---

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