]> git.eshelyaron.com Git - emacs.git/commitdiff
Clarify when gpg2 and gpg are used in the epg-gpg-program doc string
authorLars Ingebrigtsen <larsi@gnus.org>
Fri, 26 Jul 2019 12:03:11 +0000 (14:03 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Fri, 26 Jul 2019 12:03:11 +0000 (14:03 +0200)
* lisp/epg-config.el (epg-gpg-program): Doc string clarification
(bug#26090).

lisp/epg-config.el

index bb323e54fa99700e301492ef0d5ec29d7be8992f..55490681698938d7eb219edda3135b94212ea52c 100644 (file)
 (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)