Merge from emacs-23 branch.

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

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index ddbdd3541ade2497e10c5d27064ee0576b9f5a80..b556464e6e46130429ec8cb81ce859673f30e2f4 100644 (file)
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -1,9 +1,10 @@
 ;;; epg-config.el --- configuration of the EasyPG Library
 
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
+;; Package: epg
 
 ;; This file is part of GNU Emacs.
 
@@ -36,7 +37,9 @@
   :version "23.1"
   :group 'data)
 
-(defcustom epg-gpg-program "gpg"
+(defcustom epg-gpg-program (or (executable-find "gpg")
+                              (executable-find "gpg2")
+                              "gpg")
   "The `gpg' executable."
   :group 'epg
   :type 'string)