From 1c9c88b402d46611f550d9ee445cda072b5bc1f4 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 20 Oct 2014 17:51:44 -0400 Subject: [PATCH] * lisp/epg-config.el (epg-gpg-program): Don't use the absolute names by default. --- lisp/ChangeLog | 2 ++ lisp/epg-config.el | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1a57cf373e..771f2211606 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-10-20 Stefan Monnier + * 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). 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) -- 2.39.5