diff options
| author | Kenichi Handa | 2003-05-29 13:18:47 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-05-29 13:18:47 +0000 |
| commit | 063dfaf5e1a92dff8f0517259259dd6170e229e0 (patch) | |
| tree | 10595c9d505711b1dbb17524cfebc77008ee5600 /src | |
| parent | 5e5c78beb4172678f8318c6cfdced304fef94022 (diff) | |
| download | emacs-063dfaf5e1a92dff8f0517259259dd6170e229e0.tar.gz emacs-063dfaf5e1a92dff8f0517259259dd6170e229e0.zip | |
(Finsert_file_contents): Even if we read into a
unibyte buffer, check if we must decode the result or not.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fileio.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 651026fe86b..f629b4ec74f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | respectively. | 6 | respectively. |
| 7 | (decode_coding_gap): Run post-read-conversion if any. | 7 | (decode_coding_gap): Run post-read-conversion if any. |
| 8 | 8 | ||
| 9 | * fileio.c (Finsert_file_contents): Even if we read into a | ||
| 10 | unibyte buffer, check if we must decode the result or not. | ||
| 11 | |||
| 9 | 2003-05-29 Kenichi Handa <handa@m17n.org> | 12 | 2003-05-29 Kenichi Handa <handa@m17n.org> |
| 10 | 13 | ||
| 11 | * coding.c (make_conversion_work_buffer): Change the work buffer | 14 | * coding.c (make_conversion_work_buffer): Change the work buffer |
diff --git a/src/fileio.c b/src/fileio.c index 24a3377f8e8..86ac8a32570 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4428,8 +4428,7 @@ actually used. */) | |||
| 4428 | current_buffer->enable_multibyte_characters = Qnil; | 4428 | current_buffer->enable_multibyte_characters = Qnil; |
| 4429 | } | 4429 | } |
| 4430 | 4430 | ||
| 4431 | if ((! NILP (current_buffer->enable_multibyte_characters) | 4431 | if ((CODING_REQUIRE_DETECTION (&coding) |
| 4432 | || CODING_REQUIRE_DETECTION (&coding) | ||
| 4433 | || CODING_REQUIRE_DECODING (&coding)) | 4432 | || CODING_REQUIRE_DECODING (&coding)) |
| 4434 | && (inserted > 0 || CODING_REQUIRE_FLUSHING (&coding))) | 4433 | && (inserted > 0 || CODING_REQUIRE_FLUSHING (&coding))) |
| 4435 | { | 4434 | { |