(mime-edit-sign-smime): Bind `mime-transfer-level'

to 7 while calling `mime-edit-translate-region'.
(mime-edit-encrypt-pgp-mime): Insert contents into the control
part. [cf. RFC3156]

diff --git a/ChangeLog b/ChangeLog
index 6f159dc..25b3cc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * mime-edit.el (mime-edit-sign-smime): Bind `mime-transfer-level'
+       to 7 while calling `mime-edit-translate-region'.
+       (mime-edit-encrypt-pgp-mime): Insert contents into the control
+       part. [cf. RFC3156]
+
 2007-02-19  Daiki Ueno  <ueno@unixuser.org>
 
        * mime-edit.el (mime-edit-sign-pgp-mime): Create a signature for

diff --git a/mime-edit.el b/mime-edit.el
index 87d0e30..b63ee82 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1679,7 +1679,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
   (save-excursion
     (save-restriction
       (let* ((from (std11-field-body "From" mail-header-separator))
-            (ret (progn 
+            (ret (let ((mime-transfer-level 7))
                    (narrow-to-region beg end)
                    (mime-edit-translate-region beg end boundary)))
             (ctype    (car ret))
@@ -1838,6 +1838,8 @@ If no one is selected, symmetric encryption will be performed.  "
 --%s
 Content-Type: application/pgp-encrypted
 
+Version: 1
+
 --%s
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit