(Finsert_file_contents): In the case of replace,

remeber the coding system used for decoding in coding_system.

diff --git a/src/ChangeLog b/src/ChangeLog
index df6b5761a3aaee1fb503e029ed63a6efd9f29186..101533e5da16e62166efb664a0bbd7deccca055e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-07  Kenichi Handa  <handa@m17n.org>
 
+       * fileio.c (Finsert_file_contents): In the case of replace,
+       remeber the coding system used for decoding in
+       coding_system (Bug#1039).
+
        * coding.c (decode_coding_utf_8): Check byte_after_cr before
        breaking the loop.  (Bug#870)
        (decode_coding_utf_16, decode_coding_emacs_mule)

diff --git a/src/fileio.c b/src/fileio.c
index e358c3f781e7e12e7264f19ecb2780d91ee69569..e916972a3735a13d7006f04d3fc636dd169f32b8 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3687,6 +3687,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
          coding.mode &= ~CODING_MODE_LAST_BLOCK;
        }
 
+      coding_system = CODING_ID_NAME (coding.id);
       decoded = BUF_BEG_ADDR (XBUFFER (conversion_buffer));
       inserted = (BUF_Z_BYTE (XBUFFER (conversion_buffer))
                  - BUF_BEG_BYTE (XBUFFER (conversion_buffer)));