2000-11-13 16:09:09 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mml2015.el (mml2015-mailcrypt-decrypt): Handle quit.
	(mml2015-mailcrypt-clear-decrypt): Ditto.
	(mml2015-mailcrypt-verify): Ditto.
	(mml2015-mailcrypt-clear-verify): Ditto.
	(mml2015-gpg-verify): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6ca181..98b3391 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-13 16:09:09  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml2015.el (mml2015-mailcrypt-decrypt): Handle quit.
+       (mml2015-mailcrypt-clear-decrypt): Ditto.
+       (mml2015-mailcrypt-verify): Ditto.
+       (mml2015-mailcrypt-clear-verify): Ditto.
+       (mml2015-gpg-verify): Ditto.
+
 2000-11-13 15:29:58  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * smime.el (smime-openssl-program): Test the existence of openssl.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index e384063..154677f 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -93,6 +93,10 @@
                (error 
                 (mm-set-handle-multipart-parameter 
                  mm-security-handle 'gnus-details (cadr err)) 
+                nil)
+               (quit
+                (mm-set-handle-multipart-parameter 
+                 mm-security-handle 'gnus-details "Quit.") 
                 nil)))
        (unless (car result)
          (mm-set-handle-multipart-parameter 
@@ -114,6 +118,10 @@
            (error 
             (mm-set-handle-multipart-parameter 
              mm-security-handle 'gnus-details (cadr err)) 
+            nil)
+           (quit
+            (mm-set-handle-multipart-parameter 
+             mm-security-handle 'gnus-details "Quit.") 
             nil)))
     (if (car result)
        (mm-set-handle-multipart-parameter 
@@ -169,6 +177,10 @@
                  (error 
                   (mm-set-handle-multipart-parameter 
                    mm-security-handle 'gnus-details (cadr err)) 
+                  nil)
+                 (quit
+                  (mm-set-handle-multipart-parameter 
+                   mm-security-handle 'gnus-details "Quit.") 
                   nil))
          (mm-set-handle-multipart-parameter 
           mm-security-handle 'gnus-info "Failed")
@@ -183,6 +195,10 @@
        (error 
         (mm-set-handle-multipart-parameter 
          mm-security-handle 'gnus-details (cadr err)) 
+        nil)
+       (quit
+        (mm-set-handle-multipart-parameter 
+         mm-security-handle 'gnus-details "Quit.") 
         nil))
       (mm-set-handle-multipart-parameter 
        mm-security-handle 'gnus-info "OK")
@@ -325,7 +341,16 @@
             mm-security-handle 'gnus-info "Corrupted")
            (throw 'error handle))
          (mm-insert-part part)
-         (unless (gpg-verify message signature mml2015-result-buffer)
+         (unless (condition-case err
+                     (gpg-verify message signature mml2015-result-buffer)
+                   (error 
+                    (mm-set-handle-multipart-parameter 
+                     mm-security-handle 'gnus-details (cadr err)) 
+                    nil)
+                   (quit
+                    (mm-set-handle-multipart-parameter 
+                     mm-security-handle 'gnus-details "Quit.") 
+                    nil))
            (mm-set-handle-multipart-parameter 
             mm-security-handle 'gnus-details 
             (with-current-buffer mml2015-result-buffer