lisp/ChangeLog addition:

2002-05-06  Josh Huber  <huber@alum.wpi.edu>

	* mml2015.el (mml2015-gpg-encrypt): Changed name of optional
	argument, and fixed compiler warning. (added autoload for
	gpg-encrypt).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c44c5f7..5d5cd6d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-06  Josh Huber  <huber@alum.wpi.edu>
+
+       * mml2015.el (mml2015-gpg-encrypt): Changed name of optional
+       argument, and fixed compiler warning. (added autoload for
+       gpg-encrypt).
+
 2002-05-04  Simon Josefsson  <jas@extundo.com>
 
        * mml1991.el (mml1991-function-alist): Doc fix.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 712e03b..e274ab6 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -351,6 +351,7 @@ by you.")
   (autoload 'gpg-verify-cleartext "gpg")
   (autoload 'gpg-sign-detached "gpg")
   (autoload 'gpg-sign-encrypt "gpg")
+  (autoload 'gpg-encrypt "gpg")
   (autoload 'gpg-passphrase-read "gpg"))
 
 (defun mml2015-gpg-passphrase ()
@@ -566,17 +567,20 @@ by you.")
       (insert (format "--%s--\n" boundary))
       (goto-char (point-max)))))
 
-(defun mml2015-gpg-encrypt (cont &optional sign-also)
+(defun mml2015-gpg-encrypt (cont &optional sign)
   (let ((boundary
         (funcall mml-boundary-function (incf mml-multipart-number)))
        (text (current-buffer))
        cipher)
     (mm-with-unibyte-current-buffer-mule4
       (with-temp-buffer
+       ;; set up a function to call the correct gpg encrypt routine
+       ;; with the right arguments. (FIXME: this should be done
+       ;; differently.)
        (flet ((gpg-encrypt-func 
                 (sign plaintext ciphertext result recipients &optional
                       passphrase sign-with-key armor textmode)
-                (if sign-also
+                (if sign
                     (gpg-sign-encrypt
                      plaintext ciphertext result recipients passphrase
                      sign-with-key armor textmode)
@@ -584,7 +588,7 @@ by you.")
                    plaintext ciphertext result recipients passphrase
                    armor textmode))))
          (unless (gpg-encrypt-func
-                   sign-also ; passed in when using signencrypt
+                   sign ; passed in when using signencrypt
                    text (setq cipher (current-buffer))
                    mml2015-result-buffer
                    (split-string