diff options
| author | Richard M. Stallman | 1998-05-26 20:46:31 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-05-26 20:46:31 +0000 |
| commit | 65059037ab8165366021c2a6a6870b7cd928818d (patch) | |
| tree | 1e3f866d3d7c6426028863db0e4a5b2e1856a02f /src/coding.c | |
| parent | 74490e55dafccd6ebb1717c7144c5c36d6e0d838 (diff) | |
| download | emacs-65059037ab8165366021c2a6a6870b7cd928818d.tar.gz emacs-65059037ab8165366021c2a6a6870b7cd928818d.zip | |
(detect_coding_system): Treat CODING_EOL_INCONSISTENT
like CODING_EOL_UNDECIDED.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 6f9d7ca14fe..1bdac41c786 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -4546,10 +4546,11 @@ detect_coding_system (src, src_bytes, highest) | |||
| 4546 | if (!highest) | 4546 | if (!highest) |
| 4547 | val = Fnreverse (val); | 4547 | val = Fnreverse (val); |
| 4548 | 4548 | ||
| 4549 | /* Then, substitute the elements by subsidiary coding systems. */ | 4549 | /* Then, replace the elements with subsidiary coding systems. */ |
| 4550 | for (tmp = val; !NILP (tmp); tmp = XCONS (tmp)->cdr) | 4550 | for (tmp = val; !NILP (tmp); tmp = XCONS (tmp)->cdr) |
| 4551 | { | 4551 | { |
| 4552 | if (eol_type != CODING_EOL_UNDECIDED) | 4552 | if (eol_type != CODING_EOL_UNDECIDED |
| 4553 | && eol_type != CODING_EOL_INCONSISTENT) | ||
| 4553 | { | 4554 | { |
| 4554 | Lisp_Object eol; | 4555 | Lisp_Object eol; |
| 4555 | eol = Fget (XCONS (tmp)->car, Qeol_type); | 4556 | eol = Fget (XCONS (tmp)->car, Qeol_type); |