summaryrefslogtreecommitdiff
path: root/src/fileio.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2006-05-15 02:45:49 +0000
committerKenichi Handa <handa@m17n.org>2006-05-15 02:45:49 +0000
commit6f90170c47942c8b3b1ae09e8264f7eaadf89d4c (patch)
treec0773a74f56be701b68e9c086bb4a292888a9fbe /src/fileio.c
parentf0c4d038a9128d279385511064315407eec510ad (diff)
downloademacs-6f90170c47942c8b3b1ae09e8264f7eaadf89d4c.tar.gz
emacs-6f90170c47942c8b3b1ae09e8264f7eaadf89d4c.tar.bz2
emacs-6f90170c47942c8b3b1ae09e8264f7eaadf89d4c.zip
(choose_write_coding_system): Fix synching with HEAD.
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c4
1 files changed, 1 insertions, 3 deletions
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;