* epg.el (epg-passphrase-callback-function): Suggest to use

epa-passphrase-callback-function instead.
(epg-start-verify): Don't specify --verify if SIGNATURE is a
normal or a clear text signature.

diff --git a/ChangeLog b/ChangeLog
index 2446d43..77aab21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2006-09-29  Daiki Ueno  <ueno@unixuser.org>
+
+       * epg.el (epg-passphrase-callback-function): Suggest to use
+       epa-passphrase-callback-function instead.
+       (epg-start-verify): Don't specify --verify if SIGNATURE is a
+       normal or a clear text signature.
+
 2006-09-27  Daiki Ueno  <ueno@unixuser.org>
 
-       * epa-file.el (epa-file-insert-file-contents): Set progress-callback.
+       * epa-file.el (epa-file-insert-file-contents): Set progress callback.
        (epa-file-write-region): Ditto.
 
        * epa.el (epa-decrypt-file): Set callbacks.

diff --git a/epg.el b/epg.el
index 5a22737..79cd6f0 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1306,7 +1306,8 @@ This function is for internal use only."
             (format "Passphrase for %s %s: " key-id (cdr entry))
           (format "Passphrase for %s: " key-id)))))))
 
-(make-obsolete 'epg-passphrase-callback-function "Don't use")
+(make-obsolete 'epg-passphrase-callback-function
+              'epa-passphrase-callback-function)
 
 (defun epg--list-keys-1 (context name mode)
   (let ((args (append (if epg-gpg-home-directory
@@ -1595,8 +1596,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--start context (list "--" (epg-data-file signature)))
       (if (eq (process-status (epg-context-process context)) 'run)
          (process-send-string (epg-context-process context)
                               (epg-data-string signature)))
@@ -1623,9 +1623,6 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
          (epg-start-verify context
                            (epg-make-data-from-file signature)))
        (epg-wait-for-completion context)
-;      (if (epg-context-result-for context 'error)
-;          (error "Verify failed: %S"
-;                 (epg-context-result-for context 'error)))
        (unless plain
          (epg-read-output context)))
     (unless plain
@@ -1654,9 +1651,6 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
                                  (epg-make-data-from-string signed-text)))
            (epg-start-verify context (epg-make-data-from-string signature)))
          (epg-wait-for-completion context)
-;        (if (epg-context-result-for context 'error)
-;            (error "Verify failed: %S"
-;                   (epg-context-result-for context 'error)))
          (epg-read-output context))
       (epg-delete-output-file context)
       (if (and input-file