X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-edit.el;h=3156ec84e98f4ebe98353daa0949246f6840ccb9;hb=1dc398f11cf935a529b21fadca5ee8b391925edc;hp=0548f0f4c256635a2eeafdceec056801999d6ace;hpb=3ea27f9865396d57c7823a4c4ea0fc9fbab6167f;p=elisp%2Fsemi.git

diff --git a/mime-edit.el b/mime-edit.el
index 0548f0f..3156ec8 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -236,6 +236,9 @@ To insert a signature file automatically, call the function
     ("application"
      ("octet-stream" ("type" "" "tar" "shar"))
      ("postscript")
+     ("pdf")
+     ("msword")
+     ("vnd.ms-excel")
      ("vnd.ms-powerpoint")
      ("x-kiss" ("x-cnf")))
     ("image"
@@ -321,6 +324,11 @@ To insert a signature file automatically, call the function
      "base64"
      "attachment" (("filename" . file))
      )
+    ("\\.xls$"				; MS Excel
+     "application" "vnd.ms-excel" nil
+     "base64"
+     "attachment" (("filename" . file))
+     )
     ("\\.ppt$"				; MS Power Point
      "application" "vnd.ms-powerpoint" nil
      "base64"
@@ -334,7 +342,12 @@ To insert a signature file automatically, call the function
      )
     ("\\.ps$"
      "application" "postscript"	nil
-     "quoted-printable"
+     "base64"
+     "attachment"	(("filename" . file))
+     )
+    ("\\.pdf$"
+     "application" "pdf"	nil
+     "base64"
      "attachment"	(("filename" . file))
      )
 
@@ -725,7 +738,7 @@ Tspecials means any character that matches with it in header must be quoted.")
   (concat "MIME-Version:"
 	  (mime-encode-field-body
 	   (concat " 1.0 (split by " mime-edit-version ")\n")
-	   "MIME-Version:"))
+	   "MIME-Version"))
   "MIME version field for message/partial.")
 
 
@@ -2302,7 +2315,13 @@ Content-Description: S/MIME Encrypted Message][base64]]\n")
 		    (narrow-to-region beg (mime-edit-content-end))
 		    (goto-char beg)
 		    (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
-		      (replace-match "\\1\r\n"))))
+		      ;; In a certain period, `replace-match' with "\\N"
+		      ;; converted 8-bit characters into multibyte string,
+		      ;; but it has been fixed at 2004-01-15.
+		      ;;(replace-match "\\1\r\n"))))
+		      (backward-char 1)
+		      (insert "\r")
+		      (forward-char 1))))
 	      (goto-char beg)
 	      (mime-encode-region beg (mime-edit-content-end)
 				  (or encoding "7bit"))
@@ -2612,10 +2631,10 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 	    (or (cdr (assq major-mode mime-edit-message-max-lines-alist))
 		mime-edit-message-default-max-lines))
       )
-  (let* ((separator mail-header-separator)
-	 (id (concat "\""
-		     (replace-space-with-underline (current-time-string))
-		     "@" (system-name) "\"")))
+  (let ((separator mail-header-separator)
+	(id (concat "\""
+		    (replace-space-with-underline (current-time-string))
+		    "@" (system-name) "\"")))
     (run-hooks 'mime-edit-before-split-hook)
     (let ((the-buf (current-buffer))
 	  (copy-buf (get-buffer-create " *Original Message*"))
@@ -2714,6 +2733,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 ;;;
 
 (defvar mime-edit-buffer nil) ; buffer local variable
+(defvar mime-edit-temp-message-buffer nil) ; buffer local variable
 
 (defun mime-edit-preview-message ()
   "preview editing MIME message."