Problem with new sign+encrypt code

[Hans de Graaff <hans@degraaff.org>]

[-- Attachment #1.1: Type: text/plain, Size: 513 bytes --]

Hi,

After updating to the latest CVS version this morning I encountered
problems sending signed mail. I got messages like: 

  Warning, attempt to set invalid signencrypt-style

in the minibuffer. I traced this back to the mml-generate-mime-1
function in mml.el. There mml-signencrypt-style was called with a null
argument, because my buffer only contained a sign component, and not
an encrypt component. The following patch seems to fix that, but I'm
not sure if this is the proper fix.

Hans



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: mml.patch --]
[-- Type: text/x-patch, Size: 613 bytes --]

--- mml.el.~1~	Sat May 11 08:52:50 2002
+++ mml.el	Sun May 12 16:30:30 2002
@@ -540,7 +540,7 @@
 	      (message-options-set 'message-sender sender))
 	  (if (setq recipients (cdr (assq 'recipients cont)))
 	      (message-options-set 'message-recipients recipients))
-	  (let ((style (mml-signencrypt-style (first encrypt-item))))
+	  (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item)))))
 	    ;; check if: we're both signing & encrypting, both methods
 	    ;; are the same (why would they be different?!), and that
 	    ;; the signencrypt style allows for combined operation.

[-- Attachment #2: Type: application/pgp-signature, Size: 239 bytes --]