[Emacs-diffs] trunk r117966: * lisp/epg-config.el (epg-gpg-program): Use the plain program names rather

[Stefan Monnier]

------------------------------------------------------------
revno: 117966
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2014-09-27 12:26:54 -0400
message:
  * lisp/epg-config.el (epg-gpg-program): Use the plain program names rather
  than their absolute file name.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/epg-config.el             
epgconfig.el-20091113204419-o5vbwnq5f7feedwu-8558

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-27 15:52:28 +0000
+++ b/lisp/ChangeLog    2014-09-27 16:26:54 +0000
@@ -1,5 +1,8 @@
 2014-09-27  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/epg-config.el'
--- a/lisp/epg-config.el        2014-01-01 07:43:34 +0000
+++ b/lisp/epg-config.el        2014-09-27 16:26:54 +0000
@@ -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)