Commit 843b55f6 authored by Eli Zaretskii's avatar Eli Zaretskii

; Fix recent message.el-related changes

* lisp/gnus/message.el (message-openpgp-header):
* doc/misc/message.texi (OpenPGP Header): Fix the documentation
added in recent commits.
parent ed943db7
Pipeline #6307 failed with stage
in 10 seconds
......@@ -1256,7 +1256,7 @@ according to two different standards, namely @acronym{PGP} or
@subsection OpenPGP Header
The @samp{OpenPGP} header can be used to provide information about the
sender's OpenPGP key. This is a formalisation and modernisation of
sender's OpenPGP key. This is a formalization and modernization of
the non-standard @samp{X-PGP-Key} (etc.) headers that have been in use
for a long time. For more details, see
@uref{https://tools.ietf.org/html/draft-josefsson-openpgp-mailnews-header}.
......@@ -1268,9 +1268,10 @@ To use this in Message, say:
(add-hook 'message-send-hook 'messasge-add-openpgp-header)
@end lisp
Then customize the @code{message-openpgp-header} variable according to
@noindent
then customize the @code{message-openpgp-header} variable according to
your PGP setup. The variable is a list of the key ID, the key URL or
ASCII armoured, and the protection preference, one of
ASCII armored key, and the protection preference, one of
@samp{"unprotected"}, @samp{"sign"}, @samp{"encrypt"} or
@samp{"signencrypt"}.
......
......@@ -2738,18 +2738,18 @@ systematically send encrypted emails when possible."
(mml-secure-message-sign-encrypt)))
(defcustom message-openpgp-header nil
"Specification for \"OpenPGP\" header.
"Specification for the \"OpenPGP\" header of outgoing messages.
Otherwise, the variable must be a
list with three elements, all strings:
- Key ID, in hexadecimal form
- Key URL or ASCII armoured key.
The value must be a list of three elements, all strings:
- Key ID, in hexadecimal form;
- Key URL or ASCII armoured key; and
- Protection preference, one of: \"unprotected\", \"sign\",
\"encrypt\" or \"signencrypt\".
Each value may be nil, in which case it won't be inserted. If all
the values are nil, or `message-openpgp-header' is nil itself,
don't insert any header."
Each of the elements may be nil, in which case its part in the
OpenPGP header will be left out. If all the values are nil,
or `message-openpgp-header' is itself nil, the OpenPGP header
will not be inserted."
:type '(choice
(const nil :tag "Don't add OpenPGP header")
(list (choice (string :tag "ID")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment