[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2d96931: Clarify when gpg2 and gpg are used in the
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 2d96931: Clarify when gpg2 and gpg are used in the epg-gpg-program doc string |
Date: |
Fri, 26 Jul 2019 08:03:20 -0400 (EDT) |
branch: master
commit 2d969315e41ded5771a3046ed010e73be2591127
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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).
---
lisp/epg-config.el | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index bb323e5..5549068 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2d96931: Clarify when gpg2 and gpg are used in the epg-gpg-program doc string,
Lars Ingebrigtsen <=