* epg.el (epg--start): Don't specify --use-agent if the protocol

is CMS.

diff --git a/ChangeLog b/ChangeLog
index cc7a34a..292e2ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-07  Daiki Ueno  <ueno@unixuser.org>
+
+       * epg.el (epg--start): Don't specify --use-agent if the protocol
+       is CMS.
+
 2007-02-02  Daiki Ueno  <ueno@unixuser.org>
 
        * epa-file.el (epa-file-write-region): Set a dummy filename

diff --git a/epg.el b/epg.el
index 7f84366..a9efba4 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1061,7 +1061,9 @@ This function is for internal use only."
   (let* ((args (append (list "--no-tty"
                             "--status-fd" "1"
                             "--yes")
-                      (if (string-match ":" (or (getenv "GPG_AGENT_INFO") ""))
+                      (if (and (not (eq (epg-context-protocol context) 'CMS))
+                               (string-match ":" (or (getenv "GPG_AGENT_INFO")
+                                                     "")))
                           '("--use-agent"))
                       (if (and (not (eq (epg-context-protocol context) 'CMS))
                                (epg-context-progress-callback context))