From: vitaly <vitaly>
Date: Sun, 7 Feb 2010 20:52:52 +0000 (+0000)
Subject: Sign and encrypt pgp message in conformance to RFC3156.
X-Git-Tag: semi-1_14-wl-root~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4d33aa243922fcfe19d19885f10be1a775b68388;p=elisp%2Fsemi.git

Sign and encrypt pgp message in conformance to RFC3156.
---

diff --git a/ChangeLog b/ChangeLog
index cb301ee..952eb9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* mime-edit.el (mime-edit-encrypt-pgp-mime): Added Version tag for
 	pgp-encrypted messages to comply with RFC3156.
+	* mime-edit.el (mime-edit-pgp-enclose-buffer): Sign and encrypt
+	pgp message in conformance to RFC3156.
 
 2010-01-25  Harald Judt  <h.judt@gmx.at>
 
diff --git a/mime-edit.el b/mime-edit.el
index 8ffb8ad..6699712 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2891,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
 ;;;