summaryrefslogtreecommitdiff
path: root/lisp/epg-config.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/epg-config.el')
-rw-r--r--lisp/epg-config.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 2b59bd3fd02..38f7dbdaa73 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, 2011 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.
@@ -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)
@@ -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