From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 26 Jul 2019 12:03:11 +0000 (+0200)
Subject: Clarify when gpg2 and gpg are used in the epg-gpg-program doc string
X-Git-Tag: emacs-27.0.90~1817^2~101
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d969315e41ded5771a3046ed010e73be2591127;p=emacs.git

Clarify when gpg2 and gpg are used in the epg-gpg-program doc string

* lisp/epg-config.el (epg-gpg-program): Doc string clarification
(bug#26090).
---

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index bb323e54fa9..55490681698 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -44,9 +44,18 @@
 (defcustom epg-gpg-program (if (executable-find "gpg2")
                                "gpg2"
                              "gpg")
-  "The `gpg' executable.
-Setting this variable directly does not take effect;
-instead use \\[customize] (see the info node `Easy Customization')."
+  "Say what gpg program to prefer (if it satisfies minimum requirements).
+
+If this variable is \"gpg2\", but the version of gpg2 installed
+is less than `epg-gpg2-minimum-version', then version 1 of
+GnuPG (i.e., \"gpg\") will be used instead.  If the version of
+version 1 is less than `epg-gpg-minimum-version', then that won't
+be used either.
+
+If you want to explicitly specify what gpg program to use, you
+have to use \\[customize] instead (see the info node `Easy
+Customization').  Setting this variable without \\[customize] has
+no effect."
   :version "25.1"
   :type 'string)