# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1287889937 -32400
# Node ID 1b078a5862439e5afc72efb2dc256c73d990b30d
# Parent  bc1274182cc8508cf538f7a284dae6702afee194
Try to use "gpg2" if "gpg" isn't available.

* epg-config.el (epg-gpg-program): Try to use "gpg2" if "gpg"
executable is not available on the system (Bug#7268).

diff -r bc1274182cc8 -r 1b078a586243 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 23 19:22:43 2010 -0700
+++ b/lisp/ChangeLog	Sun Oct 24 12:12:17 2010 +0900
@@ -1,3 +1,8 @@
+2010-10-24  Daiki Ueno  <ueno@unixuser.org>
+
+	* epg-config.el (epg-gpg-program): Try to use "gpg2" if "gpg"
+	executable is not available on the system (Bug#7268).
+
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
 	* select.el (selection-coding-system, next-selection-coding-system):
diff -r bc1274182cc8 -r 1b078a586243 lisp/epg-config.el
--- a/lisp/epg-config.el	Sat Oct 23 19:22:43 2010 -0700
+++ b/lisp/epg-config.el	Sun Oct 24 12:12:17 2010 +0900
@@ -37,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)