emacs-27 cd93deb 2/2: Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27

[Eli Zaretskii]

branch: emacs-27
commit cd93debc600b31ec7d257ba0195ae7132df83816
Merge: 05c4329 2c0c613
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
---
 doc/misc/epa.texi | 5 ++++-
 etc/NEWS          | 2 +-
 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 49b6b53..fa1833a 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/etc/NEWS b/etc/NEWS
index 10a6e39..2c8fa9d 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'.
 
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 00f560a..6347525 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