(decode_eol_post_ccl): Special handling for undecided

and inconsistent EOL types.

diff --git a/src/ChangeLog b/src/ChangeLog
index f7ecf0199990801c81b430434a9f7c73a765cd33..4ccc973f0d3275c0dbec0e956cd794e5c648d249 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * coding.c (decode_eol_post_ccl): Special handling for undecided
+       and inconsistent EOL types.
+
 2000-06-22  Gerd Moellmann  <gerd@gnu.org>
 
        * xrdb.c (x_load_resources): Add default resource for scroll bar's

diff --git a/src/coding.c b/src/coding.c
index d02c27dc478214bd46416cff9247e5ed40e0136f..a90795d781b11ed0d157bbc01122be108fb21019 100644 (file)
--- 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;