diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/epg-config.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 384633b1ad8..dcf17693216 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-10-24 Daiki Ueno <ueno@unixuser.org> + + * epg-config.el (epg-gpg-program): Try to use "gpg2" if "gpg" + executable is not available on the system (Bug#7268). + 2010-10-24 Glenn Morris <rgm@gnu.org> * select.el (selection-coding-system, next-selection-coding-system): diff --git a/lisp/epg-config.el b/lisp/epg-config.el index 37c5d01fb1d..a439fa0480e 100644 --- a/lisp/epg-config.el +++ b/lisp/epg-config.el @@ -37,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) |