X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/eada086196ccb005ded188ac2e58d41f3682a125..4fab7badf5ce341cd6b1e32e72f55eee5c3962e8:/lisp/epg-config.el

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index aa052206be..10f0dd3f4b 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -1,6 +1,6 @@
 ;;; epg-config.el --- configuration of the EasyPG Library
 
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -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)