Mercurial > emacs
diff src/fileio.c @ 17835:f36ffb6f1208
Name change through the code:
coding-category-internal => coding-category-emacs-mule,
XXX_coding_internal => XXX_coding_emacs_mule,
coding_type_internal => coding_type_emacs_mule,
coding_type_automatic => coding_type_undecided,
CODING_CATEGORY_MASK_INTERNAL => CODING_CATEGORY_MASK_EMACS_MULE,
CODING_CATEGORY_IDX_INTERNAL => CODING_CATEGORY_IDX_EMACS_MULE,
CODING_EOL_AUTOMATIC => CODING_EOL_UNDECIDED.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 16 May 1997 00:43:29 +0000 |
| parents | 2f313f045caa |
| children | 7b3eb9189759 |
line wrap: on
line diff
--- a/src/fileio.c Fri May 16 00:43:27 1997 +0000 +++ b/src/fileio.c Fri May 16 00:43:29 1997 +0000 @@ -3165,9 +3165,9 @@ and let the following if-statement handle the replace job. */ if (!NILP (replace) && (! CODING_REQUIRE_CONVERSION (&coding) - || (coding.type == coding_type_automatic + || (coding.type == coding_type_undecided && ! CODING_REQUIRE_EOL_CONVERSION (&coding)) - || (coding.eol_type == CODING_EOL_AUTOMATIC + || (coding.eol_type == CODING_EOL_UNDECIDED && ! CODING_REQUIRE_TEXT_CONVERSION (&coding)))) { int same_at_start = BEGV; @@ -3200,7 +3200,7 @@ else if (nread == 0) break; - if (coding.type == coding_type_automatic) + if (coding.type == coding_type_undecided) detect_coding (&coding, buffer, nread); if (CODING_REQUIRE_TEXT_CONVERSION (&coding)) /* We found that the file should be decoded somehow. @@ -3210,7 +3210,7 @@ break; } - if (coding.eol_type == CODING_EOL_AUTOMATIC) + if (coding.eol_type == CODING_EOL_UNDECIDED) detect_eol (&coding, buffer, nread); if (CODING_REQUIRE_EOL_CONVERSION (&coding)) /* We found that the format of eol should be decoded.