(Required environment): Update required version of APEL to 10.7 or

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

diff --git a/mime-edit.el b/mime-edit.el
index 0377302..26938e9 100644 (file)
--- 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)