diff options
| author | Kenichi Handa | 2006-04-13 04:25:44 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-04-13 04:25:44 +0000 |
| commit | 2b89a53fc49171ca0cbbfe66c71e629840417655 (patch) | |
| tree | 7947ee020428f85eb99ec70c0fc9852575f829a2 | |
| parent | 12c83f528cc92d786663ae702c20a549dc45e83b (diff) | |
| download | emacs-2b89a53fc49171ca0cbbfe66c71e629840417655.tar.gz emacs-2b89a53fc49171ca0cbbfe66c71e629840417655.zip | |
(setup_coding_system): Fix previous change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/coding.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 71b7dde96b0..e2da810a4fc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-04-13 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * coding.c (setup_coding_system): Fix previous change. | ||
| 4 | |||
| 1 | 2006-04-13 Nick Roberts <nickrob@snap.net.nz> | 5 | 2006-04-13 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 6 | ||
| 3 | * xdisp.c (note_mouse_highlight): Add help echo for dragging vertical | 7 | * xdisp.c (note_mouse_highlight): Add help echo for dragging vertical |
diff --git a/src/coding.c b/src/coding.c index 3ffc976079c..51e76e51b71 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -3621,7 +3621,7 @@ setup_coding_system (coding_system, coding) | |||
| 3621 | = CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK; | 3621 | = CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK; |
| 3622 | } | 3622 | } |
| 3623 | else | 3623 | else |
| 3624 | coding->eol_type = system_eol_type; | 3624 | coding->eol_type = CODING_EOL_LF; |
| 3625 | 3625 | ||
| 3626 | coding_type = XVECTOR (coding_spec)->contents[0]; | 3626 | coding_type = XVECTOR (coding_spec)->contents[0]; |
| 3627 | /* Try short cut. */ | 3627 | /* Try short cut. */ |