Advertise obsolete library pgg.el less
* doc/misc/gnus-faq.texi (FAQ 8-2): * doc/misc/gnus.texi (Security): * doc/misc/message.texi (Using OpenPGP, PGP Compatibility): * doc/misc/mh-e.texi (Reading PGP, Sending PGP): * lisp/gnus/mml2015.el (mml2015-use): * lisp/info-look.el (mapc): * lisp/mh-e/mh-e.el (mh-mml-method-default): Advertise obsolete library pgg.el less. * lisp/mh-e/mh-identity.el (mh-identity-pgg-default-user-id): Rename from 'mh-identity-gpg-default-user-id', and make the old name into obsolete variable alias. Update all uses.
This commit is contained in:
Stefan Kangas
parent
b4879603fd
commit
1097c0d1e4
9 changed files with 28 additions and 85 deletions
|
|
@ -1920,10 +1920,9 @@ I can't find anything in the Gnus manual about X
|
|||
@subsubheading Answer
|
||||
|
||||
There's not only the Gnus manual but also the manuals for message,
|
||||
emacs-mime, sieve, EasyPG Assistant, and pgg. Those packages are
|
||||
distributed with Gnus and used by Gnus but aren't really part of core
|
||||
Gnus, so they are documented in different info files, you should have
|
||||
a look in those manuals, too.
|
||||
emacs-mime, sieve, and EasyPG Assistant. Those packages are
|
||||
distributed with Emacs and used by Gnus. They are documented in
|
||||
separate info files, so you should have a look in those manuals, too.
|
||||
|
||||
@node FAQ 8-3
|
||||
@subsubheading Question 8.3
|
||||
|
|
|
|||
|
|
@ -11560,8 +11560,8 @@ things to work:
|
|||
To handle @acronym{PGP} and @acronym{PGP/MIME} messages, you have to
|
||||
install an OpenPGP implementation such as GnuPG@. The Lisp interface
|
||||
to GnuPG included with Emacs is called EasyPG (@pxref{Top, ,EasyPG,
|
||||
epa, EasyPG Assistant user's manual}), but PGG (@pxref{Top, ,PGG, pgg,
|
||||
PGG Manual}), and Mailcrypt are also supported.
|
||||
epa, EasyPG Assistant user's manual}), but Mailcrypt is also
|
||||
supported.
|
||||
|
||||
@item
|
||||
To handle @acronym{S/MIME} message, you need to install OpenSSL@. OpenSSL 0.9.6
|
||||
|
|
@ -11599,18 +11599,16 @@ public-key matching the @samp{From:} header as the recipient;
|
|||
@item mml1991-use
|
||||
@vindex mml1991-use
|
||||
Symbol indicating elisp interface to OpenPGP implementation for
|
||||
@acronym{PGP} messages. The default is @code{epg}, but @code{pgg},
|
||||
and @code{mailcrypt} are also supported although
|
||||
deprecated. By default, Gnus uses the first available interface in
|
||||
this order.
|
||||
@acronym{PGP} messages. The default is @code{epg}, but
|
||||
@code{mailcrypt} is also supported although deprecated. By default,
|
||||
Gnus uses the first available interface in this order.
|
||||
|
||||
@item mml2015-use
|
||||
@vindex mml2015-use
|
||||
Symbol indicating elisp interface to OpenPGP implementation for
|
||||
@acronym{PGP/MIME} messages. The default is @code{epg}, but
|
||||
@code{pgg}, and @code{mailcrypt} are also supported
|
||||
although deprecated. By default, Gnus uses the first available
|
||||
interface in this order.
|
||||
@code{mailcrypt} is also supported although deprecated. By default,
|
||||
Gnus uses the first available interface in this order.
|
||||
|
||||
@end table
|
||||
|
||||
|
|
|
|||
|
|
@ -1249,8 +1249,8 @@ as @uref{https://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP
|
|||
implementations such as PGP 2.x and PGP 5.x are also supported. The
|
||||
default Emacs interface to the PGP implementation is EasyPG
|
||||
(@pxref{Top,,EasyPG Assistant User's Manual, epa, EasyPG Assistant
|
||||
User's Manual}), but PGG (@pxref{Top, ,PGG, pgg, PGG Manual}) and
|
||||
Mailcrypt are also supported. @xref{PGP Compatibility}.
|
||||
User's Manual}), but Mailcrypt is also supported. @xref{PGP
|
||||
Compatibility}.
|
||||
|
||||
As stated earlier, messages encrypted with OpenPGP can be formatted
|
||||
according to two different standards, namely @acronym{PGP} or
|
||||
|
|
@ -1339,8 +1339,7 @@ your PGP implementation, so we refer to it.
|
|||
If you have imported your old PGP 2.x key into GnuPG, and want to send
|
||||
signed and encrypted messages to your fellow PGP 2.x users, you'll
|
||||
discover that the receiver cannot understand what you send. One
|
||||
solution is to use PGP 2.x instead (e.g., if you use @code{pgg}, set
|
||||
@code{pgg-default-scheme} to @code{pgp}). You could also convince your
|
||||
solution is to use PGP 2.x instead. You could also convince your
|
||||
fellow PGP 2.x users to convert to GnuPG@.
|
||||
@vindex mml-signencrypt-style-alist
|
||||
As a final workaround, you can make the sign and encryption work in
|
||||
|
|
|
|||
|
|
@ -2814,24 +2814,6 @@ The appearance of the buttons is controlled by the faces
|
|||
@code{mh-show-pgg-unknown} depending on the validity of the signature.
|
||||
The latter is used whether the signature is unknown or untrusted.
|
||||
|
||||
@cindex @samp{pgg} customization group
|
||||
@cindex PGG
|
||||
@cindex customization group, @samp{pgg}
|
||||
|
||||
The @samp{pgg} customization group may have some settings which may
|
||||
interest you.
|
||||
@iftex
|
||||
See @cite{The PGG Manual}.
|
||||
@end iftex
|
||||
@ifinfo
|
||||
@xref{Top, , The PGG Manual, pgg, The PGG Manual}.
|
||||
@end ifinfo
|
||||
@ifhtml
|
||||
See
|
||||
@uref{https://www.gnu.org/software/emacs/manual/pgg.html,
|
||||
@cite{The PGG Manual}}.
|
||||
@end ifhtml
|
||||
|
||||
@node Printing
|
||||
@section Printing Your Mail
|
||||
|
||||
|
|
@ -5578,33 +5560,6 @@ variety of mail security mechanisms. The default is @samp{PGP (MIME)}
|
|||
if it is supported; otherwise, the default is @samp{None}. Other
|
||||
mechanisms include vanilla @samp{PGP} and @samp{S/MIME}.
|
||||
|
||||
@cindex @samp{pgg} customization group
|
||||
@cindex PGG
|
||||
@cindex customization group, @samp{pgg}
|
||||
|
||||
The @samp{pgg} customization group may have some settings which may
|
||||
interest you.
|
||||
@iftex
|
||||
See @cite{The PGG Manual}.
|
||||
@end iftex
|
||||
@ifinfo
|
||||
@xref{Top, , The PGG Manual, pgg, The PGG Manual}.
|
||||
@end ifinfo
|
||||
@ifhtml
|
||||
See
|
||||
@uref{https://www.gnu.org/software/emacs/manual/pgg.html,
|
||||
@cite{The PGG Manual}}.
|
||||
@end ifhtml
|
||||
|
||||
@cindex header field, @samp{Fcc}
|
||||
@cindex @samp{Fcc} header field
|
||||
@vindex pgg-encrypt-for-me
|
||||
|
||||
In particular, I turn on the option @code{pgg-encrypt-for-me} so that
|
||||
all messages I encrypt are encrypted with my public key as well. If
|
||||
you keep a copy of all of your outgoing mail with a @samp{Fcc:} header
|
||||
field, this setting is vital so that you can read the mail you write!
|
||||
|
||||
@node Checking Recipients
|
||||
@section Checking Recipients
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
;; could be removed.
|
||||
(defvar mml2015-use 'epg
|
||||
"The package used for PGP/MIME.
|
||||
Valid packages include `epg', `pgg' and `mailcrypt'.")
|
||||
Valid packages include `epg', and `mailcrypt'.")
|
||||
|
||||
;; Something is not RFC2015.
|
||||
(defvar mml2015-function-alist
|
||||
|
|
|
|||
|
|
@ -1068,7 +1068,6 @@ Return nil if there is nothing appropriate in the buffer near point."
|
|||
("newsticker" "Index")
|
||||
("octave" "(octave-mode)Variable Index" "(octave-mode)Lisp Function Index")
|
||||
("org" "Variable Index" "Command and Function Index")
|
||||
("pgg" "Variable Index" "Function Index")
|
||||
("rcirc" "Variable Index" "Index")
|
||||
("reftex" "Index")
|
||||
("sasl" "Variable Index" "Function Index")
|
||||
|
|
|
|||
|
|
@ -1790,16 +1790,7 @@ message without line wrapping."
|
|||
This option is used to select between a variety of mail security
|
||||
mechanisms. The default is \"PGP (MIME)\" if it is supported;
|
||||
otherwise, the default is \"None\". Other mechanisms include
|
||||
vanilla \"PGP\" and \"S/MIME\".
|
||||
|
||||
The `pgg' customization group may have some settings which may
|
||||
interest you (see Info node `(pgg)').
|
||||
|
||||
In particular, I turn on the option `pgg-encrypt-for-me' so that
|
||||
all messages I encrypt are encrypted with my public key as well.
|
||||
If you keep a copy of all of your outgoing mail with a \"Fcc:\"
|
||||
header field, this setting is vital so that you can read the mail
|
||||
you write!"
|
||||
vanilla \"PGP\" and \"S/MIME\"."
|
||||
:type '(choice (const :tag "PGP (MIME)" "pgpmime")
|
||||
(const :tag "PGP" "pgp")
|
||||
(const :tag "S/MIME" "smime")
|
||||
|
|
|
|||
|
|
@ -39,8 +39,10 @@
|
|||
|
||||
(autoload 'mml-insert-tag "mml")
|
||||
|
||||
(defvar-local mh-identity-pgg-default-user-id nil
|
||||
"Holds the GPG key ID to be used by pgg.el.
|
||||
(define-obsolete-variable-alias 'mh-identity-pgg-default-user-id
|
||||
'mh-identity-gpg-default-user-id "29.1")
|
||||
(defvar-local mh-identity-gpg-default-user-id nil
|
||||
"Holds the GPG key ID.
|
||||
This is normally set as part of an Identity in
|
||||
`mh-identity-list'.")
|
||||
|
||||
|
|
@ -202,15 +204,15 @@ See `mh-identity-list'."
|
|||
(defun mh-identity-handler-gpg-identity (_field action &optional value)
|
||||
"Process header FIELD \":pgg-default-user-id\".
|
||||
The ACTION is one of `remove' or `add'. If `add', the VALUE is added.
|
||||
The buffer-local variable `mh-identity-pgg-default-user-id' is set to
|
||||
The buffer-local variable `mh-identity-gpg-default-user-id' is set to
|
||||
VALUE when action `add' is selected."
|
||||
(cond
|
||||
((or (equal action 'remove)
|
||||
(not value)
|
||||
(string= value ""))
|
||||
(setq mh-identity-pgg-default-user-id nil))
|
||||
(setq mh-identity-gpg-default-user-id nil))
|
||||
((equal action 'add)
|
||||
(setq mh-identity-pgg-default-user-id value))))
|
||||
(setq mh-identity-gpg-default-user-id value))))
|
||||
|
||||
;;;###mh-autoload
|
||||
(defun mh-identity-handler-signature (_field action &optional value)
|
||||
|
|
|
|||
|
|
@ -1502,7 +1502,7 @@ a prefix argument NOCONFIRM."
|
|||
(after-find-file nil nil nil nil t)))
|
||||
|
||||
;; Shush compiler.
|
||||
(defvar mh-identity-pgg-default-user-id)
|
||||
(defvar mh-identity-gpg-default-user-id)
|
||||
|
||||
;;;###mh-autoload
|
||||
(defun mh-mml-secure-message-encrypt (method)
|
||||
|
|
@ -1513,7 +1513,7 @@ message. Use the command \\[mh-mml-unsecure-message] to remove
|
|||
this tag. Use a prefix argument METHOD to be prompted for one of
|
||||
the possible security methods (see `mh-mml-method-default')."
|
||||
(interactive (list (mh-mml-query-cryptographic-method)))
|
||||
(mh-secure-message method "encrypt" mh-identity-pgg-default-user-id))
|
||||
(mh-secure-message method "encrypt" mh-identity-gpg-default-user-id))
|
||||
|
||||
;;;###mh-autoload
|
||||
(defun mh-mml-secure-message-sign (method)
|
||||
|
|
@ -1524,7 +1524,7 @@ message. Use the command \\[mh-mml-unsecure-message] to remove
|
|||
this tag. Use a prefix argument METHOD to be prompted for one of
|
||||
the possible security methods (see `mh-mml-method-default')."
|
||||
(interactive (list (mh-mml-query-cryptographic-method)))
|
||||
(mh-secure-message method "sign" mh-identity-pgg-default-user-id))
|
||||
(mh-secure-message method "sign" mh-identity-gpg-default-user-id))
|
||||
|
||||
;;;###mh-autoload
|
||||
(defun mh-mml-secure-message-signencrypt (method)
|
||||
|
|
@ -1535,7 +1535,7 @@ message. Use the command \\[mh-mml-unsecure-message] to remove
|
|||
this tag. Use a prefix argument METHOD to be prompted for one of
|
||||
the possible security methods (see `mh-mml-method-default')."
|
||||
(interactive (list (mh-mml-query-cryptographic-method)))
|
||||
(mh-secure-message method "signencrypt" mh-identity-pgg-default-user-id))
|
||||
(mh-secure-message method "signencrypt" mh-identity-gpg-default-user-id))
|
||||
|
||||
(defvar mh-mml-cryptographic-method-history ())
|
||||
|
||||
|
|
@ -1569,9 +1569,9 @@ IDENTITY is optionally the default-user-id to use."
|
|||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
(mh-goto-header-end 1)
|
||||
(if mh-identity-pgg-default-user-id
|
||||
(if mh-identity-gpg-default-user-id
|
||||
(mml-insert-tag 'secure 'method method 'mode mode
|
||||
'sender mh-identity-pgg-default-user-id)
|
||||
'sender mh-identity-gpg-default-user-id)
|
||||
(mml-insert-tag 'secure 'method method 'mode mode)))))))
|
||||
|
||||
;;;###mh-autoload
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue