From b9ec19fa3eb2806d2fdea35fc7c19c7c9ee4bc89 Mon Sep 17 00:00:00 2001 From: ueno Date: Sun, 3 Sep 2006 01:06:37 +0000 Subject: [PATCH] Abolished epg-gpgsm-home-directory. --- ChangeLog | 1 - epg.el | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index b10915f..2007fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,6 @@ * epg.el (epg-check-configuration): New function. (epg-gpg-home-directory): New user option. - (epg-gpgsm-home-directory): New user option. * pgg-epg.el (pgg-epg-lookup-key): New function. diff --git a/epg.el b/epg.el index 7da1518..cd66283 100644 --- a/epg.el +++ b/epg.el @@ -44,11 +44,6 @@ :group 'epg :type '(choice (const :tag "Default" nil) directory)) -(defcustom epg-gpgsm-home-directory nil - "The directory which contains the `gpgsm' configuration files." - :group 'epg - :type '(choice (const :tag "Default" nil) directory)) - (defconst epg-version-number "0.0.4") (defvar epg-user-id nil @@ -810,13 +805,11 @@ This function is for internal use only." (if (eq (epg-context-protocol context) 'CMS) epg-gpgsm-program epg-gpg-program))) - (let* ((home-directory (if (eq (epg-context-protocol context) 'CMS) - epg-gpgsm-home-directory - epg-gpg-home-directory)) - (args (append (list "--no-tty" + (let* ((args (append (list "--no-tty" "--status-fd" "1" "--yes") - (if home-directory (list "--homedir" home-directory)) + (if epg-gpg-home-directory + (list "--homedir" epg-gpg-home-directory)) (unless (eq (epg-context-protocol context) 'CMS) (list "--command-fd" "0")) (if (epg-context-armor context) '("--armor")) -- 1.7.10.4