From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 27 Sep 2014 16:26:54 +0000 (-0400)
Subject: * lisp/epg-config.el (epg-gpg-program): Use the plain program names rather
X-Git-Tag: emacs-25.0.90~2635^2~679^2~205
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5551acd251f6ca0adea570a3b3781788fdae6a2a;p=emacs.git

* 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 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)