Merge from emacs-23

[gnu-emacs] / lisp / epg-config.el

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 2b59bd3fd028d28a60fc9755f535b000d51d4932..b556464e6e46130429ec8cb81ce859673f30e2f4 100644 (file)
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -4,6 +4,7 @@
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
+;; Package: epg
 
 ;; This file is part of GNU Emacs.
 
@@ -34,9 +35,11 @@
 (defgroup epg ()
   "The EasyPG library."
   :version "23.1"
-  :group 'emacs)
+  :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)