From: ueno Date: Wed, 12 Apr 2006 02:41:51 +0000 (+0000) Subject: Renamed epg-*-start -> epg-start-*. X-Git-Tag: epgsm-branchpoint~141 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9759532785a7f69bd661c1f0c76d778108e49b1;p=elisp%2Fepg.git Renamed epg-*-start -> epg-start-*. --- diff --git a/epg.el b/epg.el index 241ee92..176910a 100644 --- a/epg.el +++ b/epg.el @@ -491,7 +491,7 @@ This function is for internal use only." (defalias 'epg-make-temp-file 'make-temp-file) ;;;###autoload -(defun epg-decrypt-start (context input-file) +(defun epg-start-decrypt (context input-file) "Initiate a decrypt operation on INPUT-FILE. If you use this function, you will need to wait for the completion of @@ -499,8 +499,8 @@ If you use this function, you will need to wait for the completion of `epg-reset' to clear a temporaly output file. If you are unsure, use synchronous version of this function `epg-decrypt-string' instead." - (epg-context-set-output-file context (epg-make-temp-file "epg-output")) - (epg-start context + (epg-context-set-output-file context (epg-make-temp-file "epg-start-output")) + (epg context (list "--decrypt" input-file)) (epg-wait-for-status context '("BEGIN_DECRYPTION"))) @@ -509,7 +509,7 @@ If you are unsure, use synchronous version of this function "Decrypt INPUT-FILE and return the plain text." (unwind-protect (progn - (epg-decrypt-start context input-file) + (epg-start-decrypt context input-file) (epg-wait-for-completion context) (unless (epg-context-result-for context 'decrypt) (epg-read-output context))) @@ -530,7 +530,7 @@ If you are unsure, use synchronous version of this function (delete-file input-file))))) ;;;###autoload -(defun epg-verify-start (context signature &optional string) +(defun epg-start-verify (context signature &optional string) "Initiate a verify operation on SIGNATURE. For a detached signature, both SIGNATURE and STRING should be string. @@ -541,11 +541,11 @@ If you use this function, you will need to wait for the completion of `epg-reset' to clear a temporaly output file. If you are unsure, use synchronous version of this function `epg-verify-string' instead." - (epg-context-set-output-file context (epg-make-temp-file "epg-output")) + (epg-context-set-output-file context (epg-make-temp-file "epg-start-output")) (if string ;; Detached signature. (progn - (epg-start context + (epg context (append (list "--verify") (list signature "-"))) (if (eq (process-status (epg-context-process context)) 'run) @@ -567,7 +567,7 @@ For a normal or a clear text signature, STRING should be nil." (progn (if string (write-region signature nil input-file)) - (epg-verify-start context input-file string) + (epg-start-verify context input-file string) (epg-wait-for-completion context) (epg-context-result-for context 'verify)) (epg-reset context) @@ -575,7 +575,7 @@ For a normal or a clear text signature, STRING should be nil." (delete-file input-file))))) ;;;###autoload -(defun epg-sign-start (context string &optional mode) +(defun epg-start-sign (context string &optional mode) "Initiate a sign operation on STRING. If optional 3rd argument MODE is 'clearsign, it makes a clear text signature. @@ -587,8 +587,8 @@ If you use this function, you will need to wait for the completion of `epg-reset' to clear a temporaly output file. If you are unsure, use synchronous version of this function `epg-sign-string' instead." - (epg-context-set-output-file context (epg-make-temp-file "epg-output")) - (epg-start context + (epg-context-set-output-file context (epg-make-temp-file "epg-start-output")) + (epg context (append (list (if (eq 'clearsign) "--clearsign" (if (or (eq mode t) (eq mode 'detached)) @@ -610,13 +610,13 @@ If MODE is t or 'detached, it makes a detached signature. Otherwise, it makes a normal signature." (unwind-protect (progn - (epg-sign-start context string mode) + (epg-start-sign context string mode) (epg-wait-for-completion context) (epg-read-output context)) (epg-reset context))) ;;;###autoload -(defun epg-encrypt-start (context string recipients +(defun epg-start-encrypt (context string recipients &optional sign always-trust) "Initiate a encrypt operation on STRING. If RECIPIENTS is nil, it does symmetric encryption. @@ -626,8 +626,8 @@ If you use this function, you will need to wait for the completion of `epg-reset' to clear a temporaly output file. If you are unsure, use synchronous version of this function `epg-encrypt-string' instead." - (epg-context-set-output-file context (epg-make-temp-file "epg-output")) - (epg-start context + (epg-context-set-output-file context (epg-make-temp-file "epg-start-output")) + (epg context (append (if always-trust '("--always-trust")) (if recipients '("--encrypt") '("--symmetric")) (if sign @@ -654,7 +654,7 @@ If you are unsure, use synchronous version of this function If RECIPIENTS is nil, it does symmetric encryption." (unwind-protect (progn - (epg-encrypt-start context string recipients sign always-trust) + (epg-start-encrypt context string recipients sign always-trust) (epg-wait-for-completion context) (epg-read-output context)) (epg-reset context)))