Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2b6741..3d5747a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * mml2015.el (autoload): Autoload correct files.  Trivial patch
        from dme@dme.org.
+       (mml2015-pgg-decrypt, mml2015-pgg-verify): Make sure either nil or
+       handle is returned.
 
 2002-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index e31a2d0..cdda790 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -687,7 +687,8 @@ by you.")
                  handles
                (list handles)))
          (mm-set-handle-multipart-parameter
-          mm-security-handle 'gnus-info "Failed"))))))
+          mm-security-handle 'gnus-info "Failed")
+         (throw 'error handle))))))
 
 (defun mml2015-pgg-clear-decrypt ()
   (let ((pgg-errors-buffer mml2015-result-buffer))
@@ -756,7 +757,8 @@ by you.")
                 (mml2015-gpg-extract-signature-details))))
          (delete-file signature-file)
          (mm-set-handle-multipart-parameter
-          mm-security-handle 'gnus-info "Failed"))))))
+          mm-security-handle 'gnus-info "Failed")))))
+  handle)
 
 (defun mml2015-pgg-clear-verify ()
   (let ((pgg-errors-buffer mml2015-result-buffer))