* lisp/epg-config.el (epg-gpg-program): Don't use the absolute names by default.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1a57cf373e0e34e79c1ddefb39c754075156568..771f22116064466af6d3622532eaca55552d0e0a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * epg-config.el (epg-gpg-program): Don't use the absolute names by default.
+
        * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
        case (bug#18767).
 

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 10b3704144351869a337c7c76ff3dfedf1b35cca..16ed6e1f5c9ea4e4d88e5ef1a755745e2f6a45fa 100644 (file)
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -39,9 +39,9 @@
   :group 'data
   :group 'external)
 
-(defcustom epg-gpg-program (or (executable-find "gpg")
-                              (executable-find "gpg2")
-                              "gpg")
+(defcustom epg-gpg-program (cond ((executable-find "gpg") "gpg")
+                                ((executable-find "gpg2") "gpg2")
+                                (t "gpg"))
   "The `gpg' executable."
   :group 'epg
   :type 'string)