Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-266
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-267
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-268
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-269
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-270
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-271
   Rename "field-at-point" to "field-at-pos"

 * emacs@sv.gnu.org/emacs--devo--0--patch-272
   (comint-insert-input): Remove redundant calls to setq and goto-char

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-556

1 files changed, 2 insertions, 0 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 2248963102a..7bfcc98541b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4940,6 +4940,8 @@ choose_write_coding_system (start, end, filename,
   setup_coding_system (Fcheck_coding_system (val), coding);
 
  done_setup_coding:
+  if (coding->eol_type == CODING_EOL_UNDECIDED)
+    coding->eol_type = system_eol_type;
   if (!STRINGP (start) && !NILP (current_buffer->selective_display))
     coding->mode |= CODING_MODE_SELECTIVE_DISPLAY;
 }