From 856e671bc5b6e52047085d3d289ef2ae4cab525e Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 14 Nov 2006 04:52:31 +0000 Subject: [PATCH] * epg.el (epg--start): Don't specify --enable-progress-filter for gpgsm. (epg--status-PROGRESS): Check if progress-callback is set. --- ChangeLog | 6 ++++++ epg.el | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7167de..fc1ab05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-14 Daiki Ueno + + * epg.el (epg--start): Don't specify --enable-progress-filter for + gpgsm. + (epg--status-PROGRESS): Check if progress-callback is set. + 2006-11-12 Daiki Ueno * epg.el (epg-error): New error. diff --git a/epg.el b/epg.el index 2a54aeb..114c83b 100644 --- a/epg.el +++ b/epg.el @@ -1045,7 +1045,8 @@ This function is for internal use only." "--yes") (if (string-match ":" (or (getenv "GPG_AGENT_INFO") "")) '("--use-agent")) - (if (epg-context-progress-callback context) + (if (and (not (eq (epg-context-protocol context) 'CMS)) + (epg-context-progress-callback context)) '("--enable-progress-filter")) (if epg-gpg-home-directory (list "--homedir" epg-gpg-home-directory)) @@ -1429,8 +1430,9 @@ This function is for internal use only." (epg-sig-notations signature)))))) (defun epg--status-PROGRESS (context string) - (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)" - string) + (if (and (epg-context-progress-callback context) + (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)" + string)) (funcall (if (consp (epg-context-progress-callback context)) (car (epg-context-progress-callback context)) (epg-context-progress-callback context)) -- 1.7.10.4