* epg.el (epg-start-decrypt): Append "--" to the end of options.

(epg-start-verify): Ditto.
(epg-start-sign): Ditto.
(epg-start-encrypt): Ditto.
(epg-start-import-keys): Ditto.
(epg-start-generate-key): Ditto.

diff --git a/ChangeLog b/ChangeLog
index bc42389..bfa3c24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-09-23  Daiki Ueno  <ueno@unixuser.org>
 
+       * epg.el (epg-start-decrypt): Append "--" to the end of options.
+       (epg-start-verify): Ditto.
+       (epg-start-sign): Ditto.
+       (epg-start-encrypt): Ditto.
+       (epg-start-import-keys): Ditto.
+       (epg-start-generate-key): Ditto.
+
+2006-09-23  Daiki Ueno  <ueno@unixuser.org>
+
        * epg.el (epg-make-context): Don't set progress-callback by
        default.
        (epg--start): Don't specify --enable-progress-filter if

diff --git a/epg.el b/epg.el
index 4e51c94..0f0b133 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1512,7 +1512,7 @@ You can then use `write-region' to write new data into the file."
 ;;;###autoload
 (defun epg-start-decrypt (context cipher)
   "Initiate a decrypt operation on CIPHER.
-CIPHER is a data object.
+CIPHER must be a file data object.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
@@ -1523,7 +1523,7 @@ If you are unsure, use synchronous version of this function
     (error "Not a file"))
   (epg-context-set-operation context 'decrypt)
   (epg-context-set-result context nil)
-  (epg--start context (list "--decrypt" (epg-data-file cipher)))
+  (epg--start context (list "--decrypt" "--" (epg-data-file cipher)))
   ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed.
   (unless (eq (epg-context-protocol context) 'CMS)
     (epg-wait-for-status context '("BEGIN_DECRYPTION"))))
@@ -1588,7 +1588,7 @@ If you are unsure, use synchronous version of this function
   (if signed-text
       ;; Detached signature.
       (if (epg-data-file signed-text)
-         (epg--start context (list "--verify" (epg-data-file signature)
+         (epg--start context (list "--verify" "--" (epg-data-file signature)
                                   (epg-data-file signed-text)))
        (epg--start context (list "--verify" (epg-data-file signature) "-"))
        (if (eq (process-status (epg-context-process context)) 'run)
@@ -1598,7 +1598,7 @@ If you are unsure, use synchronous version of this function
            (process-send-eof (epg-context-process context))))
     ;; Normal (or cleartext) signature.
     (if (epg-data-file signature)
-       (epg--start context (list "--verify" (epg-data-file signature)))
+       (epg--start context (list "--verify" "--" (epg-data-file signature)))
       (epg--start context (list "--verify"))
       (if (eq (process-status (epg-context-process context)) 'run)
          (process-send-string (epg-context-process context)
@@ -1697,7 +1697,7 @@ If you are unsure, use synchronous version of this function
                                      (car (epg-key-sub-key-list signer)))))
                             (epg-context-signers context)))
                     (if (epg-data-file plain)
-                        (list (epg-data-file plain)))))
+                        (list "--" (epg-data-file plain)))))
   ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed.
   (unless (eq (epg-context-protocol context) 'CMS)
     (epg-wait-for-status context '("BEGIN_SIGNING")))
@@ -1790,7 +1790,7 @@ If you are unsure, use synchronous version of this function
                                      (car (epg-key-sub-key-list recipient)))))
                             recipients))
                     (if (epg-data-file plain)
-                        (list (epg-data-file plain)))))
+                        (list "--" (epg-data-file plain)))))
   ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed.
   (unless (eq (epg-context-protocol context) 'CMS)
     (if sign
@@ -1914,7 +1914,7 @@ If you are unsure, use synchronous version of this function
   (epg-context-set-operation context 'import-keys)
   (epg-context-set-result context nil)
   (epg--start context (if (epg-data-file keys)
-                         (list "--import" (epg-data-file keys))
+                         (list "--import" "--" (epg-data-file keys))
                        (list "--import")))
   (when (epg-data-string keys)
     (if (eq (process-status (epg-context-process context)) 'run)
@@ -2050,7 +2050,7 @@ If you are unsure, use synchronous version of this function
   (epg-context-set-operation context 'generate-key)
   (epg-context-set-result context nil)
   (if (epg-data-file parameters)
-      (epg--start context (list "--batch" "--genkey"
+      (epg--start context (list "--batch" "--genkey" "--"
                               (epg-data-file parameters)))
     (epg--start context '("--batch" "--genkey"))
     (if (eq (process-status (epg-context-process context)) 'run)