diff options
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/epg-config.el | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -711,6 +711,10 @@ at BOL or EOL, or in whitespace there. To enable these, customize, respectively, `show-paren-when-point-inside-paren' or `show-paren-when-point-in-periphery'. +--- +** If gpg2 exists on the system, it is now used as the default value +of `epg-gpg-program' (instead of gpg). + ** Lisp mode --- diff --git a/lisp/epg-config.el b/lisp/epg-config.el index e92bcd62a66..c41d97dbfac 100644 --- a/lisp/epg-config.el +++ b/lisp/epg-config.el @@ -39,10 +39,11 @@ :group 'data :group 'external) -(defcustom epg-gpg-program (cond ((executable-find "gpg") "gpg") - ((executable-find "gpg2") "gpg2") - (t "gpg")) +(defcustom epg-gpg-program (if (executable-find "gpg2") + "gpg2" + "gpg") "The `gpg' executable." + :version "25.1" :group 'epg :type 'string) |