[Emacs-diffs] emacs-24 r117598: * lisp/epg-config.el (epg-gpg-program): Don't use the absolute names by default.

[Stefan Monnier]

------------------------------------------------------------
revno: 117598
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-20 17:51:44 -0400
message:
  * lisp/epg-config.el (epg-gpg-program): Don't use the absolute names by 
default.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/epg-config.el             
epgconfig.el-20091113204419-o5vbwnq5f7feedwu-8558

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-20 19:23:50 +0000
+++ b/lisp/ChangeLog    2014-10-20 21:51:44 +0000
@@ -1,5 +1,7 @@
 2014-10-20  Stefan Monnier  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/epg-config.el'
--- a/lisp/epg-config.el        2014-01-01 07:43:34 +0000
+++ b/lisp/epg-config.el        2014-10-20 21:51:44 +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)