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 384633b1ad8c955c73678ecd9974312665b03d19..dcf1769321615ab80e7f9271ea961328d38dce52 100644 (file)
--- 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 37c5d01fb1d530214fb1f19e9251228ce897b7fa..a439fa0480e4b9e8b06b3290655ce20d9597d23d 100644 (file)
--- 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)