From: Kenichi Handa <handa@m17n.org>
Date: Mon, 15 May 2006 02:45:49 +0000 (+0000)
Subject: (choose_write_coding_system): Fix synching with HEAD.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~959
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f90170c47942c8b3b1ae09e8264f7eaadf89d4c;p=emacs.git

(choose_write_coding_system): Fix synching with HEAD.
---

diff --git a/src/fileio.c b/src/fileio.c
index cf0d84539d6..066668d107f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4898,10 +4898,8 @@ choose_write_coding_system (start, end, filename,
 	val = raw_text_coding_system (val);
     }
 
+  val = coding_inherit_eol_type (val, Qnil);
   setup_coding_system (val, coding);
-  if (! NILP (val)
-      && VECTORP (CODING_ID_EOL_TYPE (coding->id)))
-    val = AREF (CODING_ID_EOL_TYPE (coding->id), 0);
 
   if (!STRINGP (start) && !NILP (current_buffer->selective_display))
     coding->mode |= CODING_MODE_SELECTIVE_DISPLAY;