diff options
| author | Kenichi Handa | 2009-11-05 04:16:04 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-11-05 04:16:04 +0000 |
| commit | f6a074209a507c56ff9183b0806af0f214fc29f9 (patch) | |
| tree | a5be6aea746fcc809dda0f8078ac5f200cbbf1f1 /src | |
| parent | 775adc51434983e7c1e397bb3a6cfa9308e66bae (diff) | |
| download | emacs-f6a074209a507c56ff9183b0806af0f214fc29f9.tar.gz emacs-f6a074209a507c56ff9183b0806af0f214fc29f9.zip | |
(Finsert_file_contents): Be sure set coding-system of
the buffer in case of replace.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8dd87270863..d103f180c52 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-11-05 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fileio.c (Finsert_file_contents): Be sure set coding-system of | ||
| 4 | the buffer in case of replace. | ||
| 5 | |||
| 1 | 2009-11-04 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2009-11-04 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * puresize.h (BASE_PURESIZE): Increase to 1620000. | 8 | * puresize.h (BASE_PURESIZE): Increase to 1620000. |
diff --git a/src/fileio.c b/src/fileio.c index 146e77c14ec..c61604ac31d 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3713,6 +3713,7 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 3713 | } | 3713 | } |
| 3714 | 3714 | ||
| 3715 | coding_system = CODING_ID_NAME (coding.id); | 3715 | coding_system = CODING_ID_NAME (coding.id); |
| 3716 | set_coding_system = 1; | ||
| 3716 | decoded = BUF_BEG_ADDR (XBUFFER (conversion_buffer)); | 3717 | decoded = BUF_BEG_ADDR (XBUFFER (conversion_buffer)); |
| 3717 | inserted = (BUF_Z_BYTE (XBUFFER (conversion_buffer)) | 3718 | inserted = (BUF_Z_BYTE (XBUFFER (conversion_buffer)) |
| 3718 | - BUF_BEG_BYTE (XBUFFER (conversion_buffer))); | 3719 | - BUF_BEG_BYTE (XBUFFER (conversion_buffer))); |