masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-08 13:19:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eli Zaretskii 2020-07-20 17:31:50 +03:00
commit cd93debc60
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/misc/epa.texi
View file

@ -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 C-s
@kindex C-c C-e s @kindex C-c C-e s
@findex epa-mail-sign @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 @item C-c C-e C-e and C-c C-e e
@kindex C-c C-e C-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 addresses using the @code{epa-mail-aliases} list. You can also
use that option to ignore specific recipients for encryption purposes. 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 @end table
@node Encrypting/decrypting gpg files, , Mail-mode integration, Commands @node Encrypting/decrypting gpg files, , Mail-mode integration, Commands

2
etc/NEWS
View file

@ -270,7 +270,7 @@ doing before changing the value.
+++ +++
** Native GnuTLS connections can now use client certificates. ** Native GnuTLS connections can now use client certificates.
Previously, this support was only available when using the external 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 ':client-certificate t' to trigger looking up of per-server
certificates via 'auth-source'. certificates via 'auth-source'.

5
lisp/epa-mail.el
View file

@ -85,7 +85,10 @@ The buffer is expected to contain a mail message."
;;;###autoload ;;;###autoload
(defun epa-mail-sign (start end signers mode) (defun epa-mail-sign (start end signers mode)
"Sign the current buffer. "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)) (declare (interactive-only t))
(interactive (interactive
(save-excursion (save-excursion