From: Kenichi Handa <handa@m17n.org>
Date: Wed, 12 Apr 2006 05:48:37 +0000 (+0000)
Subject: (setup_coding_system): Use system_eol_type for default
X-Git-Tag: emacs-pretest-22.0.90~3200
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=957b3c5f2f6280605908e0b7694bead9539082b4;p=emacs.git

(setup_coding_system): Use system_eol_type for default
coding->eol_type.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 936b14089b4..7688664c45d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-12  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (setup_coding_system): Use system_eol_type for default
+	coding->eol_type.
+
 2006-04-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* lisp.h (wrong_type_argument): Mark as NO_RETURN.
diff --git a/src/coding.c b/src/coding.c
index 105d4038b1f..3ffc976079c 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3621,7 +3621,7 @@ setup_coding_system (coding_system, coding)
 	= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
     }
   else
-    coding->eol_type = CODING_EOL_LF;
+    coding->eol_type = system_eol_type;
 
   coding_type = XVECTOR (coding_spec)->contents[0];
   /* Try short cut.  */
@@ -3922,7 +3922,7 @@ setup_coding_system (coding_system, coding)
   coding->type = coding_type_no_conversion;
   coding->category_idx = CODING_CATEGORY_IDX_BINARY;
   coding->common_flags = 0;
-  coding->eol_type = CODING_EOL_LF;
+  coding->eol_type = NILP (coding_system) ? system_eol_type : CODING_EOL_LF;
   coding->pre_write_conversion = coding->post_read_conversion = Qnil;
   return -1;
 }