X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0ed082fedf31241b54ef2294c29c4880a7472e0e..62f1ca498cf11a3fa9b707c115673ea7b298e957:/lisp/epg-config.el

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index ddbdd3541a..38f7dbdaa7 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -1,9 +1,10 @@
 ;;; epg-config.el --- configuration of the EasyPG Library
 
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
+;; Package: epg
 
 ;; This file is part of GNU Emacs.
 
@@ -36,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)
@@ -144,5 +147,4 @@ Note that the buffer name starts with a space."
 
 (provide 'epg-config)
 
-;; arch-tag: 9aca7cb8-5f63-4bcb-84ee-46fd2db0763f
 ;;; epg-config.el ends here