From 74b01b80ee7a73710d9c17d3eaeadbea38181f8a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 23 Jun 2000 05:32:45 +0000 Subject: [PATCH] (decode_eol_post_ccl): Special handling for undecided and inconsistent EOL types. --- src/ChangeLog | 5 +++++ src/coding.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f7ecf019999..4ccc973f0d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-06-23 Eli Zaretskii + + * coding.c (decode_eol_post_ccl): Special handling for undecided + and inconsistent EOL types. + 2000-06-22 Gerd Moellmann * xrdb.c (x_load_resources): Add default resource for scroll bar's diff --git a/src/coding.c b/src/coding.c index d02c27dc478..a90795d781b 100644 --- a/src/coding.c +++ b/src/coding.c @@ -3944,13 +3944,19 @@ decode_eol_post_ccl (coding, ptr, bytes) /* Here, to avoid the call of setup_coding_system, we directly call detect_eol_type. */ coding->eol_type = detect_eol_type (ptr, bytes, &dummy); - val = Fget (coding->symbol, Qeol_type); - if (VECTORP (val) && XVECTOR (val)->size == 3) - coding->symbol = XVECTOR (val)->contents[coding->eol_type]; + if (coding->eol_type == CODING_EOL_INCONSISTENT) + coding->eol_type = CODING_EOL_LF; + if (coding->eol_type != CODING_EOL_UNDECIDED) + { + val = Fget (coding->symbol, Qeol_type); + if (VECTORP (val) && XVECTOR (val)->size == 3) + coding->symbol = XVECTOR (val)->contents[coding->eol_type]; + } coding->mode |= CODING_MODE_INHIBIT_INCONSISTENT_EOL; } - if (coding->eol_type == CODING_EOL_LF) + if (coding->eol_type == CODING_EOL_LF + || coding->eol_type == CODING_EOL_UNDECIDED) { /* We have nothing to do. */ ptr = pend; -- 2.39.2