Mercurial > emacs
changeset 103133:2f7395806731
(record_conversion_result): Don't modify
Vlast_code_conversion_error for successful result.
(alloc_destination): Don't clobber conversion result. (Bug#1650)
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 02 May 2009 11:32:42 +0000 |
| parents | e1c910297520 |
| children | 9569175bb813 |
| files | src/ChangeLog src/coding.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat May 02 08:33:25 2009 +0000 +++ b/src/ChangeLog Sat May 02 11:32:42 2009 +0000 @@ -1,3 +1,9 @@ +2009-05-02 Andreas Schwab <schwab@linux-m68k.org> + + * coding.c (record_conversion_result): Don't modify + Vlast_code_conversion_error for successful result. + (alloc_destination): Don't clobber conversion result. (Bug#1650) + 2009-05-01 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change) * charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z.
--- a/src/coding.c Sat May 02 08:33:25 2009 +0000 +++ b/src/coding.c Sat May 02 11:32:42 2009 +0000 @@ -992,6 +992,8 @@ case CODING_RESULT_INSUFFICIENT_MEM: Vlast_code_conversion_error = Qinsufficient_memory; break; + case CODING_RESULT_SUCCESS: + break; default: Vlast_code_conversion_error = intern ("Unknown error"); } @@ -1203,7 +1205,6 @@ } else coding_alloc_by_realloc (coding, nbytes); - record_conversion_result (coding, CODING_RESULT_SUCCESS); coding_set_destination (coding); dst = coding->destination + offset; return dst;