[Emacs-diffs] Changes to emacs/src/coding.c

[Kenichi Handa]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.261 emacs/src/coding.c:1.262
*** emacs/src/coding.c:1.261    Fri Oct 18 06:06:49 2002
--- emacs/src/coding.c  Sat Nov  2 03:16:57 2002
***************
*** 1,7 ****
  /* Coding system handler (conversion, detection, and etc).
     Copyright (C) 1995, 1997, 1998, 2002 Electrotechnical Laboratory, JAPAN.
     Licensed to the Free Software Foundation.
!    Copyright (C) 2001 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
--- 1,7 ----
  /* Coding system handler (conversion, detection, and etc).
     Copyright (C) 1995, 1997, 1998, 2002 Electrotechnical Laboratory, JAPAN.
     Licensed to the Free Software Foundation.
!    Copyright (C) 2001,2002  Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
***************
*** 942,952 ****
              ONE_MORE_BYTE (c);
              if (c != '\n')
                {
-                 if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
-                   {
-                     coding->result = CODING_FINISH_INCONSISTENT_EOL;
-                     goto label_end_of_loop;
-                   }
                  src--;
                  c = '\r';
                }
--- 942,947 ----
***************
*** 1830,1840 ****
              ONE_MORE_BYTE (c1);
              if (c1 != ISO_CODE_LF)
                {
-                 if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
-                   {
-                     coding->result = CODING_FINISH_INCONSISTENT_EOL;
-                     goto label_end_of_loop;
-                   }
                  src--;
                  c1 = '\r';
                }
--- 1825,1830 ----
***************
*** 2928,2939 ****
                      ONE_MORE_BYTE (c2);
                      if (c2 == '\n')
                        c1 = c2;
-                     else if (coding->mode
-                              & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
-                       {
-                         coding->result = CODING_FINISH_INCONSISTENT_EOL;
-                         goto label_end_of_loop;
-                       }
                      else
                        /* To process C2 again, SRC is subtracted by 1.  */
                        src--;
--- 2918,2923 ----
***************
*** 3179,3189 ****
              ONE_MORE_BYTE (c);
              if (c != '\n')
                {
-                 if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
-                   {
-                     coding->result = CODING_FINISH_INCONSISTENT_EOL;
-                     goto label_end_of_loop;
-                   }
                  src--;
                  c = '\r';
                }
--- 3163,3168 ----