diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2014-06-28 09:24:01 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@linux-m68k.org> | 2014-06-28 09:24:01 +0200 |
commit | b084415e278d54c6f9ee8406b1af8adc2364576c (patch) | |
tree | 73ab4d164b248fdfa28a9acceb1efe32981a4913 /src | |
parent | 90f33ead9b23b116751754cce3033059b9e40754 (diff) | |
download | emacs-b084415e278d54c6f9ee8406b1af8adc2364576c.tar.gz |
Fixes: debbugs:17865
* coding.c (encode_coding_utf_8): Correctly count produced_chars
also in unibyte case.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/coding.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3e3c0cba183..eac62eef7a7 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-25 Glenn Morris <rgm@gnu.org> * puresize.h (BASE_PURESIZE): Increase a bit. (Bug#17846) diff --git a/src/coding.c b/src/coding.c index 654e39c0e3d..bd4a8be08b3 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; |