From: Daiki Ueno <ueno@unixuser.org>
Date: Sun, 24 Oct 2010 03:12:17 +0000 (+0900)
Subject: Try to use "gpg2" if "gpg" isn't available.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~490
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ec6ca720b6c69782f5a7b6558d4a8ae22d2c0d6;p=emacs.git

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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 384633b1ad8..dcf17693216 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/epg-config.el b/lisp/epg-config.el
index 37c5d01fb1d..a439fa0480e 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -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)