Sync with semi-1_14_0-pre1.

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

diff --git a/mime/mime-edit.el b/mime/mime-edit.el
index 885d4fe..9e6d449 100644 (file)
--- a/mime/mime-edit.el
+++ b/mime/mime-edit.el
@@ -317,7 +317,7 @@ To insert a signature file automatically, call the function
     ;;  Octect binary text
 
     ("\\.doc$"                         ;MS Word
-     "application" "winword" nil
+     "application" "msword" nil
      "base64"
      "attachment" (("filename" . file))
      )
@@ -2470,7 +2470,9 @@ and insert data encoded as ENCODING."
   (mime-edit-insert-tag "application" "pgp-keys")
   (mime-edit-define-encoding "7bit")
   (pgg-insert-key)
-  )
+  (if (and (not (eobp))
+          (not (looking-at mime-edit-single-part-tag-regexp)))
+      (insert (mime-make-text-tag) "\n")))
 
 
 ;;; @ flag setting