diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-07 13:01:01 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-07 13:01:01 +1100 |
| commit | f93d669a16bd3cb3f43f0c8cfd22fe18b627a6a1 (patch) | |
| tree | 635c7077bcebfc25213fb493e70b31a63e3ee32e /lisp/epg-config.el | |
| parent | 35cbe2095ba024f6ee60799cd560771f2ef739a4 (diff) | |
| download | emacs-f93d669a16bd3cb3f43f0c8cfd22fe18b627a6a1.tar.gz | |
Default to gpg2 instead of gpg
* lisp/epg-config.el (epg-gpg-program): Prefer gpg2 over gpg, if
it exists. This fixes many problems with using the GPG
authentication agent.
Diffstat (limited to 'lisp/epg-config.el')
| -rw-r--r-- | lisp/epg-config.el | 7 |
1 files changed, 4 insertions, 3 deletions
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) |