summaryrefslogtreecommitdiff
path: root/lisp/epg-config.el
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2010-10-24 12:12:17 +0900
committerDaiki Ueno <ueno@unixuser.org>2010-10-24 12:12:17 +0900
commit3ec6ca720b6c69782f5a7b6558d4a8ae22d2c0d6 (patch)
tree2647e68a3e911bf47df1ac05b2acc58ac6310321 /lisp/epg-config.el
parentf5f2561564816a522723d9579684fb05c9fe143a (diff)
downloademacs-3ec6ca720b6c69782f5a7b6558d4a8ae22d2c0d6.tar.gz
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).
Diffstat (limited to 'lisp/epg-config.el')
-rw-r--r--lisp/epg-config.el4
1 files changed, 3 insertions, 1 deletions
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)