diff options
| author | Kenichi Handa | 2006-04-13 04:39:20 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-04-13 04:39:20 +0000 |
| commit | 9642847f36380bc6c39bf8d19b907266d72fbd61 (patch) | |
| tree | a5115f4ae3cad743efb17f21cc3609b6bfea4b7f /src | |
| parent | 2b89a53fc49171ca0cbbfe66c71e629840417655 (diff) | |
| download | emacs-9642847f36380bc6c39bf8d19b907266d72fbd61.tar.gz emacs-9642847f36380bc6c39bf8d19b907266d72fbd61.zip | |
(encode_coding): If eol_type is not yet decided, use
system_eol_type.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/coding.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e2da810a4fc..9955aabd0e7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | 2006-04-13 Kenichi Handa <handa@m17n.org> | 1 | 2006-04-13 Kenichi Handa <handa@m17n.org> |
| 2 | 2 | ||
| 3 | * coding.c (setup_coding_system): Fix previous change. | 3 | * coding.c (setup_coding_system): Fix previous change. |
| 4 | (encode_coding): If eol_type is not yet decided, use | ||
| 5 | system_eol_type. | ||
| 4 | 6 | ||
| 5 | 2006-04-13 Nick Roberts <nickrob@snap.net.nz> | 7 | 2006-04-13 Nick Roberts <nickrob@snap.net.nz> |
| 6 | 8 | ||
diff --git a/src/coding.c b/src/coding.c index 51e76e51b71..5fb4c202b85 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -4998,6 +4998,8 @@ encode_coding (coding, source, destination, src_bytes, dst_bytes) | |||
| 4998 | coding->consumed = coding->consumed_char = 0; | 4998 | coding->consumed = coding->consumed_char = 0; |
| 4999 | coding->errors = 0; | 4999 | coding->errors = 0; |
| 5000 | coding->result = CODING_FINISH_NORMAL; | 5000 | coding->result = CODING_FINISH_NORMAL; |
| 5001 | if (coding->eol_type == CODING_EOL_UNDECIDED) | ||
| 5002 | coding->eol_type = system_eol_type; | ||
| 5001 | 5003 | ||
| 5002 | switch (coding->type) | 5004 | switch (coding->type) |
| 5003 | { | 5005 | { |