Handle encrypting mime parts

* epa-mail.el (epa-mail-encrypt): Insert any encoded mime parts
that are queued up to insert before sending the message.

diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 3ad4da16c890f2602f4c2952b3c39eae37d269ff..dd171ab6474deac0da4492ec6ac2f0cdcf864581 100644 (file)
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -243,6 +243,11 @@ If no one is selected, symmetric encryption will be performed.  "
       (setq epa-last-coding-system-specified
            (or coding-system-for-write
                (select-safe-coding-system (point) (point-max)))))
+ 
+    ;; Insert contents of requested attachments, if any.
+    (when (and (eq major-mode 'mail-mode) mail-encode-mml)
+      (mml-to-mime)
+      (setq mail-encode-mml nil))
 
     ;; Don't let some read-only text stop us from encrypting.
     (let ((inhibit-read-only t))