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.

3 files changed, 14 insertions, 21 deletions

diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index a61620b2761..f6031df9c24 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -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")
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index b7fa35a92f5..bcdf91299be 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -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)
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 2f1b835de02..316463b9897 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -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