(decode_eol_post_ccl): Special handling for undecided

and inconsistent EOL types.

(decode_eol_post_ccl): Special handling for undecided
and inconsistent EOL types.
74b01b80 · Eli Zaretskii · affbf647 · 74b01b80 · 74b01b80
Commit 74b01b80 authored Jun 23, 2000 by Eli Zaretskii
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

src/ChangeLog src/ChangeLog +5 -0

src/coding.c src/coding.c +10 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
--- 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;