From: Kenichi Handa <handa@m17n.org>
Date: Wed, 7 Jan 2009 12:28:19 +0000 (+0000)
Subject: (Finsert_file_contents): In the case of replace,
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/50b062219484473b4369e80de5f1704642db63f5

(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 df6b5761a3..101533e5da 100644
--- 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 e358c3f781..e916972a37 100644
--- 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)));