update.

[elisp/semi.git] / mime-edit.el

diff --git a/mime-edit.el b/mime-edit.el
index 31d0569..9c42e2b 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2221,6 +2221,7 @@ Content-Transfer-Encoding: 7bit
 --%s
 Content-Type: application/pgp-encrypted
 
+Version: 1
 --%s
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit
@@ -2876,11 +2877,11 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
            (setq mime-edit-pgp-processing 
                  (nconc mime-edit-pgp-processing 
                         (copy-sequence '(encrypt)))))
-       (message "This message will be encrypt.")
+       (message "This message will be encrypted.")
        )
     (setq mime-edit-pgp-processing
          (delq 'encrypt mime-edit-pgp-processing))
-    (message "This message will not be encrypt.")
+    (message "This message will not be encrypted.")
     ))
 
 (defun mime-edit-pgp-enclose-buffer ()
@@ -2890,20 +2891,13 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
                   (match-end 0)
                 )))
        )
-    (if beg
-       (dolist (pgp-processing mime-edit-pgp-processing)
-         (case pgp-processing
-           (sign
-            (mime-edit-enclose-pgp-signed-region 
-             beg (point-max))
-            )
-           (encrypt
-            (mime-edit-enclose-pgp-encrypted-region 
-             beg (point-max))
-            )))
+    (when beg
+      (if (memq 'sign mime-edit-pgp-processing)
+         (mime-edit-enclose-pgp-signed-region beg (point-max)))
+      (if (memq 'encrypt mime-edit-pgp-processing)
+         (mime-edit-enclose-pgp-encrypted-region beg (point-max)))
       )))
 
-
 ;;; @ split
 ;;;