From: hayashi <hayashi>
Date: Fri, 16 Jun 2000 08:40:28 +0000 (+0000)
Subject: * mime-edit.el (mime-edit-insert-file): Make it work with Emacs.
X-Git-Tag: emy-1_13_7~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c8761492cca8c5c72693d901e502cfc210bf431b;p=elisp%2Fsemi.git

* mime-edit.el (mime-edit-insert-file): Make it work with Emacs.
---

diff --git a/ChangeLog b/ChangeLog
index a936862..e67604c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-06-16  Yoshiki Hayashi  <yoshiki@xemacs.org>
 
+	* mime-edit.el (mime-edit-insert-file): Make it work with Emacs.
+
+2000-06-16  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
 	* mime-edit.el (mime-edit-insert-text-file): New function.
 	(mime-file-types): Treat .htm as an HTML file.
 
diff --git a/mime-edit.el b/mime-edit.el
index 53a2355..7dc21fb 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1168,9 +1168,15 @@ Content-Transfer-Encoding and Content-Disposition headers."
 				  (car candidates)
 				candidates))
 	      (setq eol (coding-system-eol-type candidate))
-	      (cond ((eq eol 'lf)
+	      (cond ((eq eol
+			 (static-if (featurep 'xemacs)
+			     'lf
+			   0))
 		     (setq eol-string "\n"))
-		    ((eq eol 'cr)
+		    ((eq eol
+			 (static-if (featurep 'xemacs)
+			     'cr
+			   2))
 		     (setq eol-string "\r")))
 	      (goto-char (point-min))
 	      (when eol-string