[Emacs-diffs] /srv/bzr/emacs/trunk r102074: Try to use "gpg2" if "gpg" isn't available.

[Daiki Ueno]

------------------------------------------------------------
revno: 102074
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-24 12:12:17 +0900
message:
  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).
modified:
  lisp/ChangeLog
  lisp/epg-config.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-24 02:22:43 +0000
+++ b/lisp/ChangeLog    2010-10-24 03:12:17 +0000
@@ -1,3 +1,8 @@
+2010-10-24  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * select.el (selection-coding-system, next-selection-coding-system):

=== modified file 'lisp/epg-config.el'
--- a/lisp/epg-config.el        2010-08-29 16:17:13 +0000
+++ b/lisp/epg-config.el        2010-10-24 03:12:17 +0000
@@ -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)