mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

(decode_coding_emacs_mule, decode_coding_iso2022)

Browse Source 
(decode_coding_sjis_big5, decode_eol): Allow lone \r in DOS EOL.
This commit is contained in:
Stefan Monnier 2002-11-02 08:16:57 +00:00
parent 18a9f96815
commit ea9d458bec
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/coding.c
View File

@ -1,7 +1,7 @@
/* Coding system handler (conversion, detection, and etc). /* Coding system handler (conversion, detection, and etc).
Copyright (C) 1995, 1997, 1998, 2002 Electrotechnical Laboratory, JAPAN. Copyright (C) 1995, 1997, 1998, 2002 Electrotechnical Laboratory, JAPAN.
Licensed to the Free Software Foundation. Licensed to the Free Software Foundation.
Copyright (C) 2001 Free Software Foundation, Inc. Copyright (C) 2001,2002 Free Software Foundation, Inc.
This file is part of GNU Emacs. This file is part of GNU Emacs.
@ -942,11 +942,6 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes)
ONE_MORE_BYTE (c); ONE_MORE_BYTE (c);
if (c != '\n') if (c != '\n')
{ {
if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
{
coding->result = CODING_FINISH_INCONSISTENT_EOL;
goto label_end_of_loop;
}
src--; src--;
c = '\r'; c = '\r';
} }
@ -1830,11 +1825,6 @@ decode_coding_iso2022 (coding, source, destination, src_bytes, dst_bytes)
ONE_MORE_BYTE (c1); ONE_MORE_BYTE (c1);
if (c1 != ISO_CODE_LF) 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--; src--;
c1 = '\r'; c1 = '\r';
} }
@ -2928,12 +2918,6 @@ decode_coding_sjis_big5 (coding, source, destination,
ONE_MORE_BYTE (c2); ONE_MORE_BYTE (c2);
if (c2 == '\n') if (c2 == '\n')
c1 = c2; c1 = c2;
else if (coding->mode
& CODING_MODE_INHIBIT_INCONSISTENT_EOL)
{
coding->result = CODING_FINISH_INCONSISTENT_EOL;
goto label_end_of_loop;
}
else else
/* To process C2 again, SRC is subtracted by 1. */ /* To process C2 again, SRC is subtracted by 1. */
src--; src--;
@ -3179,11 +3163,6 @@ decode_eol (coding, source, destination, src_bytes, dst_bytes)
ONE_MORE_BYTE (c); ONE_MORE_BYTE (c);
if (c != '\n') if (c != '\n')
{ {
if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
{
coding->result = CODING_FINISH_INCONSISTENT_EOL;
goto label_end_of_loop;
}
src--; src--;
c = '\r'; c = '\r';
} }