procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Default to gpg2 instead of gpg

Browse source 
* lisp/epg-config.el (epg-gpg-program): Prefer gpg2 over gpg, if
it exists.  This fixes many problems with using the GPG
authentication agent.
This commit is contained in:
Lars Ingebrigtsen 2016-02-07 13:01:01 +11:00
parent 35cbe2095b
commit f93d669a16
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS
View file

@ -711,6 +711,10 @@ at BOL or EOL, or in whitespace there. To enable these, customize,
respectively, `show-paren-when-point-inside-paren' or respectively, `show-paren-when-point-inside-paren' or
`show-paren-when-point-in-periphery'. `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 ** Lisp mode
--- ---

7
lisp/epg-config.el
View file

@ -39,10 +39,11 @@
:group 'data :group 'data
:group 'external) :group 'external)
(defcustom epg-gpg-program (cond ((executable-find "gpg") "gpg") (defcustom epg-gpg-program (if (executable-find "gpg2")
((executable-find "gpg2") "gpg2") "gpg2"
(t "gpg")) "gpg")
"The `gpg' executable." "The `gpg' executable."
:version "25.1"
:group 'epg :group 'epg
:type 'string) :type 'string)