Merge branch 'master' into cairo

[gnu-emacs] / lisp / epg-config.el

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index aa052206bec1e3398ed74e55af67a5e0bee85f1e..10f0dd3f4bf79b781d237e1365957d8abc28613d 100644 (file)
--- 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)