* mime-edit.el (mime-edit-user-agent-value): Don't require

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

diff --git a/mime-edit.el b/mime-edit.el
index 6123802..a8a38ff 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -125,9 +125,9 @@
 (autoload 'pgg-insert-key "pgg"
   "Insert PGP public key at point." t)
 (autoload 'smime-encrypt-region "smime"
-  "S/MIME encryption of current region." t)
+  "S/MIME encryption of current region.")
 (autoload 'smime-sign-region "smime"
-  "S/MIME signature of current region." t)
+  "S/MIME signature of current region.")
 
 
 ;;; @ version
@@ -646,11 +646,8 @@ If it is not specified for a major-mode,
          " ("
          (mime-product-code-name mime-library-product)
          ") "
-         (condition-case nil
-             (progn
-               (require 'apel-ver)
-               (concat (apel-version) " "))
-           (file-error nil))
+         (if (fboundp 'apel-version)
+             (concat (apel-version) " "))
          (if (featurep 'xemacs)
              (concat (cond ((featurep 'utf-2000)
                             (concat "UTF-2000-MULE/" utf-2000-version))
@@ -1983,11 +1980,17 @@ Content-Transfer-Encoding: 7bit
        (goto-char beg)
        (insert (format "--[[multipart/signed;
  boundary=\"%s\"; micalg=sha1;
- protocol=\"application/x-pkcs7-signature\"][7bit]]
+ protocol=\"application/pkcs7-signature\"][7bit]]
 --%s
 " smime-boundary smime-boundary))
        (goto-char (point-max))
-       (insert "\n--" smime-boundary "\n")
+       (insert (format "\n--%s
+Content-Type: application/pkcs7-signature; name=\"smime.p7s\"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=\"smime.p7s\"
+Content-Description: S/MIME Cryptographic Signature
+
+"  smime-boundary))
        (insert-buffer-substring smime-output-buffer)
        (goto-char (point-max))
        (insert (format "\n--%s--\n" smime-boundary))
@@ -2015,13 +2018,9 @@ Content-Transfer-Encoding: 7bit
            (throw 'mime-edit-error 'pgp-error)
            )
        (delete-region (point-min)(point-max))
-       (with-current-buffer smime-output-buffer
-         (goto-char (point-min))
-         (delete-region (point-min) (progn
-                                      (re-search-forward "^$" nil t)
-                                      (point))))
-       (insert "--[[application/x-pkcs7-mime
-Content-Disposition: attachment; filename=\"smime.p7m\"][base64]]\n")
+       (insert "--[[application/pkcs7-mime; name=\"smime.p7m\"
+Content-Disposition: attachment; filename=\"smime.p7m\"
+Content-Description: S/MIME Encrypted Message][base64]]\n")
        (insert-buffer-substring smime-output-buffer)
        ))))