* lisp/epg-config.el (epg-gpg-program): Use the plain program names rather

than their absolute file name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5a188b2417da510f71fcdfbd2082e2a367f1d9c..62f3138c9d194643b4e62ad510d41a941b2142e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-09-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * epg-config.el (epg-gpg-program): Use the plain program names rather
+       than their absolute file name.
+
        * subr.el (track-mouse): New macro.
        * emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form):
        Remove track-mouse case.

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)