X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-edit.el;h=26938e93f7e347af89afed1837876efb6db81a9a;hb=309a7f5d32f628d292c2adbf042c58ac0ee34132;hp=03773027dc0758d9fb8ff00a149dae16f01760bc;hpb=f0eccf7aadab9ca0102c08deec0eb0adaf3fdbfa;p=elisp%2Fsemi.git

diff --git a/mime-edit.el b/mime-edit.el
index 0377302..26938e9 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1733,6 +1733,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
 		    )
 		(delete-region beg end)
 		(or (looking-at mime-edit-beginning-tag-regexp)
+		    (looking-at mime-edit-multipart-end-regexp)
 		    (eobp)
 		    (insert (concat (mime-make-text-tag) "\n"))
 		    )))
@@ -1821,7 +1822,8 @@ Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
 		   (or mime-edit-pgp-user-id
 		       (if from 
 			   (nth 1 (std11-extract-address-components from))
-			 pgg-default-user-id))))
+			 pgg-default-user-id)))
+		  (pgg-text-mode t))
 	      (pgg-sign-region (point-min)(point-max)))
 	    (throw 'mime-edit-error 'pgp-error)
 	    )
@@ -1912,7 +1914,8 @@ Content-Transfer-Encoding: 7bit
 		     (or mime-edit-pgp-user-id
 			 (if from 
 			     (nth 1 (std11-extract-address-components from))
-			   pgg-default-user-id))))		     
+			   pgg-default-user-id)))
+		    (pgg-text-mode t))
 		(pgg-encrypt-region 
 		 (point-min) (point-max) 
 		 (mapcar (lambda (recipient)