[Emacs-diffs] emacs-24 r117323: Fixes: debbugs:17865

[Andreas Schwab]

------------------------------------------------------------
revno: 117323
revision-id: address@hidden
parent: address@hidden
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2014-06-28 09:24:01 +0200
message:
  Fixes: debbugs:17865
  
  * coding.c (encode_coding_utf_8): Correctly count produced_chars
  also in unibyte case.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/coding.c                   coding.c-20091113204419-o5vbwnq5f7feedwu-1077

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-25 20:48:41 +0000
+++ b/src/ChangeLog     2014-06-28 07:24:01 +0000
@@ -1,3 +1,8 @@
+2014-06-28  Andreas Schwab  <address@hidden>
+
+       * coding.c (encode_coding_utf_8): Correctly count produced_chars
+       also in unibyte case.  (Bug#17865)
+
 2014-06-25  Glenn Morris  <address@hidden>
 
        * puresize.h (BASE_PURESIZE): Increase a bit.  (Bug#17846)

=== modified file 'src/coding.c'
--- a/src/coding.c      2014-01-29 13:21:25 +0000
+++ b/src/coding.c      2014-06-28 07:24:01 +0000
@@ -1549,8 +1549,8 @@
            *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;