[Emacs-diffs] emacs-25 f93d669: Default to gpg2 instead of gpg

[Lars Ingebrigtsen]

branch: emacs-25
commit f93d669a16bd3cb3f43f0c8cfd22fe18b627a6a1
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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.
---
 etc/NEWS           |    4 ++++
 lisp/epg-config.el |    7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index e5f34a1..18c08dc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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 e92bcd6..c41d97d 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)