Merge from emacs-24; up to 2014-06-12T14:55:48Z!monnier@iro.umontreal.ca

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f611365fcd..7f1b3fdf6b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * coding.c (encode_coding_utf_8): Correctly count produced_chars
+        also in unibyte case.  (Bug#17865)
+
 2014-06-28  K. Handa  <handa@gnu.org>
 
         * coding.c (MAX_CHARBUF_SIZE): Renamed from CHARBUF_SIZE.
diff --git a/src/coding.c b/src/coding.c
index 64bad7ccbe8..5dbaf96840a 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1549,8 +1549,8 @@ encode_coding_utf_8 (struct coding_system *coding)
             *dst++ = CHAR_TO_BYTE8 (c);
           else
             CHAR_STRING_ADVANCE_NO_UNIFY (c, dst);
-          produced_chars++;
         }
+      produced_chars = dst - (coding->destination + coding->produced);
     }
   record_conversion_result (coding, CODING_RESULT_SUCCESS);
   coding->produced_char += produced_chars;