summaryrefslogtreecommitdiff
path: root/lisp/epg-config.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-07-26 14:03:11 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-07-26 14:03:11 +0200
commit2d969315e41ded5771a3046ed010e73be2591127 (patch)
tree2a1d9f7fd5dd2e4fd1ef931e49c801762c154f4f /lisp/epg-config.el
parent8c60694779e28b9a53067acf1800b26c72173c48 (diff)
downloademacs-2d969315e41ded5771a3046ed010e73be2591127.tar.gz
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).
Diffstat (limited to 'lisp/epg-config.el')
-rw-r--r--lisp/epg-config.el15
1 files changed, 12 insertions, 3 deletions
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)