* epg.el (epg-cancel): Set 'error result.

diff --git a/ChangeLog b/ChangeLog
index e878e48..78c58cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 
        * epg.el (epg-read-output): Don't convert line endings of the
        output file.
 
        * epg.el (epg-read-output): Don't convert line endings of the
        output file.

+       (epg-cancel): Set 'error result.

 
 2006-04-29  Daiki Ueno  <ueno@unixuser.org>
 
 
 2006-04-29  Daiki Ueno  <ueno@unixuser.org>
 

diff --git a/epg.el b/epg.el
index e8bbc5d..17aae6b 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -781,7 +781,7 @@ This function is for internal use only."
              (quit
               (epg-context-set-result-for
                epg-context 'error
              (quit
               (epg-context-set-result-for
                epg-context 'error

-               (cons 'quit
+               (cons '(quit)

                      (epg-context-result-for epg-context 'error)))
               (delete-process process)))
          (if passphrase
                      (epg-context-result-for epg-context 'error)))
               (delete-process process)))
          (if passphrase

@@ -799,7 +799,7 @@ This function is for internal use only."
       (quit
        (epg-context-set-result-for
        epg-context 'error
       (quit
        (epg-context-set-result-for
        epg-context 'error

-       (cons 'quit
+       (cons '(quit)

              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 
              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 

@@ -814,7 +814,7 @@ This function is for internal use only."
       (quit
        (epg-context-set-result-for
        epg-context 'error
       (quit
        (epg-context-set-result-for
        epg-context 'error

-       (cons 'quit
+       (cons '(quit)

              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 
              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 

@@ -967,7 +967,7 @@ This function is for internal use only."
 (defun epg-status-DECRYPTION_FAILED (process string)
   (epg-context-set-result-for
    epg-context 'error
 (defun epg-status-DECRYPTION_FAILED (process string)
   (epg-context-set-result-for
    epg-context 'error

-   (cons 'decryption-failed
+   (cons '(decryption-failed)

         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-NODATA (process string)
         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-NODATA (process string)

@@ -991,13 +991,13 @@ This function is for internal use only."
 (defun epg-status-KEYREVOKED (process string)
   (epg-context-set-result-for
    epg-context 'error
 (defun epg-status-KEYREVOKED (process string)
   (epg-context-set-result-for
    epg-context 'error

-   (cons 'key-revoked
+   (cons '(key-revoked)

         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-BADARMOR (process string)
   (epg-context-set-result-for
    epg-context 'error
         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-BADARMOR (process string)
   (epg-context-set-result-for
    epg-context 'error

-   (cons 'bad-armor
+   (cons '(bad-armor)

         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-INV_RECP (process string)
         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-INV_RECP (process string)

@@ -1012,7 +1012,7 @@ This function is for internal use only."
 (defun epg-status-NO_RECP (process string)
   (epg-context-set-result-for
    epg-context 'error
 (defun epg-status-NO_RECP (process string)
   (epg-context-set-result-for
    epg-context 'error

-   (cons 'no-recipients
+   (cons '(no-recipients)

         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-DELETE_PROBLEM (process string)
         (epg-context-result-for epg-context 'error))))
 
 (defun epg-status-DELETE_PROBLEM (process string)

@@ -1241,6 +1241,13 @@ You can then use `write-region' to write new data into the file."
 
 ;;;###autoload
 (defun epg-cancel (context)
 
 ;;;###autoload
 (defun epg-cancel (context)

+  (if (buffer-live-p (process-buffer process))
+      (save-excursion
+       (set-buffer (process-buffer process))
+       (epg-context-set-result-for
+        epg-context 'error
+        (cons '(quit)
+              (epg-context-result-for epg-context 'error)))))

   (if (eq (process-status (epg-context-process context)) 'run)
       (delete-process (epg-context-process context))))
   
   (if (eq (process-status (epg-context-process context)) 'run)
       (delete-process (epg-context-process context))))