diff options
| author | Kenichi Handa | 2009-01-07 12:28:19 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-01-07 12:28:19 +0000 |
| commit | 50b062219484473b4369e80de5f1704642db63f5 (patch) | |
| tree | 483c093647ed677fe9366e40811c56dc0270821c /src | |
| parent | 7f0995a11bf1b60955b06c48855c51edad1f0f2e (diff) | |
| download | emacs-50b062219484473b4369e80de5f1704642db63f5.tar.gz emacs-50b062219484473b4369e80de5f1704642db63f5.zip | |
(Finsert_file_contents): In the case of replace,
remeber the coding system used for decoding in coding_system.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index df6b5761a3a..101533e5da1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2009-01-07 Kenichi Handa <handa@m17n.org> | 1 | 2009-01-07 Kenichi Handa <handa@m17n.org> |
| 2 | 2 | ||
| 3 | * fileio.c (Finsert_file_contents): In the case of replace, | ||
| 4 | remeber the coding system used for decoding in | ||
| 5 | coding_system (Bug#1039). | ||
| 6 | |||
| 3 | * coding.c (decode_coding_utf_8): Check byte_after_cr before | 7 | * coding.c (decode_coding_utf_8): Check byte_after_cr before |
| 4 | breaking the loop. (Bug#870) | 8 | breaking the loop. (Bug#870) |
| 5 | (decode_coding_utf_16, decode_coding_emacs_mule) | 9 | (decode_coding_utf_16, decode_coding_emacs_mule) |
diff --git a/src/fileio.c b/src/fileio.c index e358c3f781e..e916972a373 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3687,6 +3687,7 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 3687 | coding.mode &= ~CODING_MODE_LAST_BLOCK; | 3687 | coding.mode &= ~CODING_MODE_LAST_BLOCK; |
| 3688 | } | 3688 | } |
| 3689 | 3689 | ||
| 3690 | coding_system = CODING_ID_NAME (coding.id); | ||
| 3690 | decoded = BUF_BEG_ADDR (XBUFFER (conversion_buffer)); | 3691 | decoded = BUF_BEG_ADDR (XBUFFER (conversion_buffer)); |
| 3691 | inserted = (BUF_Z_BYTE (XBUFFER (conversion_buffer)) | 3692 | inserted = (BUF_Z_BYTE (XBUFFER (conversion_buffer)) |
| 3692 | - BUF_BEG_BYTE (XBUFFER (conversion_buffer))); | 3693 | - BUF_BEG_BYTE (XBUFFER (conversion_buffer))); |