diff options
| author | Lars Ingebrigtsen | 2019-07-26 14:03:11 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-26 14:03:11 +0200 |
| commit | 2d969315e41ded5771a3046ed010e73be2591127 (patch) | |
| tree | 2a1d9f7fd5dd2e4fd1ef931e49c801762c154f4f /lisp | |
| parent | 8c60694779e28b9a53067acf1800b26c72173c48 (diff) | |
| download | emacs-2d969315e41ded5771a3046ed010e73be2591127.tar.gz emacs-2d969315e41ded5771a3046ed010e73be2591127.zip | |
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')
| -rw-r--r-- | lisp/epg-config.el | 15 |
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 @@ | |||
| 44 | (defcustom epg-gpg-program (if (executable-find "gpg2") | 44 | (defcustom epg-gpg-program (if (executable-find "gpg2") |
| 45 | "gpg2" | 45 | "gpg2" |
| 46 | "gpg") | 46 | "gpg") |
| 47 | "The `gpg' executable. | 47 | "Say what gpg program to prefer (if it satisfies minimum requirements). |
| 48 | Setting this variable directly does not take effect; | 48 | |
| 49 | instead use \\[customize] (see the info node `Easy Customization')." | 49 | If this variable is \"gpg2\", but the version of gpg2 installed |
| 50 | is less than `epg-gpg2-minimum-version', then version 1 of | ||
| 51 | GnuPG (i.e., \"gpg\") will be used instead. If the version of | ||
| 52 | version 1 is less than `epg-gpg-minimum-version', then that won't | ||
| 53 | be used either. | ||
| 54 | |||
| 55 | If you want to explicitly specify what gpg program to use, you | ||
| 56 | have to use \\[customize] instead (see the info node `Easy | ||
| 57 | Customization'). Setting this variable without \\[customize] has | ||
| 58 | no effect." | ||
| 50 | :version "25.1" | 59 | :version "25.1" |
| 51 | :type 'string) | 60 | :type 'string) |
| 52 | 61 | ||