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

than their absolute file name.

2 files changed, 6 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5a188b2417..62f3138c9d1 100644
--- 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 10b37041443..16ed6e1f5c9 100644
--- 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)