X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/678fb7066698ebfe3aecba722294025ed26da01b..fe9c8b687c5121a413342024b62824a86d2de2be:/lisp/epg-config.el?ds=sidebyside

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index fd2468f9a4..e92bcd62a6 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -1,6 +1,6 @@
 ;;; epg-config.el --- configuration of the EasyPG Library
 
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -33,13 +33,15 @@
   "Report bugs to this address.")
 
 (defgroup epg ()
-  "The EasyPG library."
+  "Interface to the GNU Privacy Guard (GnuPG)."
+  :tag "EasyPG"
   :version "23.1"
-  :group 'data)
+  :group 'data
+  :group 'external)
 
-(defcustom epg-gpg-program (or (executable-find "gpg")
-			       (executable-find "gpg2")
-			       "gpg")
+(defcustom epg-gpg-program (cond ((executable-find "gpg") "gpg")
+				 ((executable-find "gpg2") "gpg2")
+				 (t "gpg"))
   "The `gpg' executable."
   :group 'epg
   :type 'string)
@@ -49,6 +51,12 @@
   :group 'epg
   :type 'string)
 
+(defcustom epg-gpgconf-program "gpgconf"
+  "The `gpgconf' executable."
+  :version "25.1"
+  :group 'epg
+  :type 'string)
+
 (defcustom epg-gpg-home-directory nil
   "The directory which contains the configuration files of `epg-gpg-program'."
   :group 'epg