2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bf9f7be831e..2f7e192fbac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-01  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny patch)
+
+        * coding.c (Fencode_coding_string): Record the last coding system
+        used, as the function doc string says (bug#8738).
+
 2011-07-01  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xsettings.c (store_monospaced_changed): Take new font as arg and
diff --git a/src/coding.c b/src/coding.c
index 9939774ea82..65c8a767c2b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9000,7 +9000,7 @@ not fully specified.)  */)
   (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer)
 {
   return code_convert_string (string, coding_system, buffer,
-                              1, ! NILP (nocopy), 1);
+                              1, ! NILP (nocopy), 0);
 }