From: ueno <ueno>
Date: Fri, 29 Sep 2006 03:58:41 +0000 (+0000)
Subject: (epg-verify-file): Mention that the plaintext will be stored into
X-Git-Tag: epg-0_0_6~8
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5c1c00b073f106769618692d88fd56ed813e099d;p=elisp%2Fepg.git

(epg-verify-file): Mention that the plaintext will be stored into
the file PLAIN after successful verification.
(epg-verify-string): Mention that the plaintext will be returned
after successful verification.
---

diff --git a/ChangeLog b/ChangeLog
index 77aab21..48064d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	epa-passphrase-callback-function instead.
 	(epg-start-verify): Don't specify --verify if SIGNATURE is a
 	normal or a clear text signature.
+	(epg-verify-file): Mention that the plaintext will be stored into
+	the file PLAIN after successful verification.
+	(epg-verify-string): Mention that the plaintext will be returned
+	after successful verification.
 
 2006-09-27  Daiki Ueno  <ueno@unixuser.org>
 
diff --git a/epg.el b/epg.el
index 79cd6f0..c3e704b 100644
--- a/epg.el
+++ b/epg.el
@@ -765,7 +765,7 @@ This function is for internal use only."
    (cond ((eq (epg-new-signature-type new-signature) 'detached)
 	  "Detached signature ")
 	 ((eq (epg-new-signature-type new-signature) 'clear)
-	  "Clear text signature ")
+	  "Cleartext signature ")
 	 (t
 	  "Signature "))
    (cdr (assq (epg-new-signature-pubkey-algorithm new-signature)
@@ -1573,7 +1573,7 @@ If PLAIN is nil, it returns the result as a string."
 SIGNATURE and SIGNED-TEXT are a data object if they are specified.
 
 For a detached signature, both SIGNATURE and SIGNED-TEXT should be set.
-For a normal or a clear text signature, SIGNED-TEXT should be nil.
+For a normal or a cleartext signature, SIGNED-TEXT should be nil.
 
 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
@@ -1608,8 +1608,10 @@ If you are unsure, use synchronous version of this function
   "Verify a file SIGNATURE.
 SIGNED-TEXT and PLAIN are also a file if they are specified.
 
-For a detached signature, both SIGNATURE and SIGNED-TEXT should be string.
-For a normal or a clear text signature, SIGNED-TEXT should be nil."
+For a detached signature, both SIGNATURE and SIGNED-TEXT should be
+string.  For a normal or a cleartext signature, SIGNED-TEXT should be
+nil.  In the latter case, if PLAIN is specified, the plaintext is
+stored into the file after successful verification."
   (unwind-protect
       (progn
 	(if plain
@@ -1634,8 +1636,10 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
   "Verify a string SIGNATURE.
 SIGNED-TEXT is a string if it is specified.
 
-For a detached signature, both SIGNATURE and SIGNED-TEXT should be string.
-For a normal or a clear text signature, SIGNED-TEXT should be nil."
+For a detached signature, both SIGNATURE and SIGNED-TEXT should be
+string.  For a normal or a cleartext signature, SIGNED-TEXT should be
+nil.  In the latter case, this function returns the plaintext after
+successful verification."
   (let ((coding-system-for-write 'binary)
 	input-file)
     (unwind-protect
@@ -1665,7 +1669,7 @@ PLAIN is a data object.
 
 If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
 If it is nil or 'normal, it makes a normal signature.
-Otherwise, it makes a clear text signature.
+Otherwise, it makes a cleartext signature.
 
 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
@@ -1705,7 +1709,7 @@ If you are unsure, use synchronous version of this function
 If SIGNATURE is nil, it returns the result as a string.
 If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
 If it is nil or 'normal, it makes a normal signature.
-Otherwise, it makes a clear text signature."
+Otherwise, it makes a cleartext signature."
   (unwind-protect
       (progn
 	(if signature
@@ -1730,7 +1734,7 @@ Otherwise, it makes a clear text signature."
   "Sign a string PLAIN and return the output as string.
 If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
 If it is nil or 'normal, it makes a normal signature.
-Otherwise, it makes a clear text signature."
+Otherwise, it makes a cleartext signature."
   (unwind-protect
       (progn
 	(epg-context-set-output-file context