Quiet, woman. (Sorry...).

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

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 3cdf2ff3ffacd9c2a1c20b575deaab21cb1e95e9..a439fa0480e4b9e8b06b3290655ce20d9597d23d 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)