Commit 409ea3a1 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

(record_conversion_result): Don't modify

Vlast_code_conversion_error for successful result.
(alloc_destination): Don't clobber conversion result.  (Bug#1650)
parent 36fc0932
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) 2009-05-01 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z. * charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z.
......
...@@ -992,6 +992,8 @@ record_conversion_result (struct coding_system *coding, ...@@ -992,6 +992,8 @@ record_conversion_result (struct coding_system *coding,
case CODING_RESULT_INSUFFICIENT_MEM: case CODING_RESULT_INSUFFICIENT_MEM:
Vlast_code_conversion_error = Qinsufficient_memory; Vlast_code_conversion_error = Qinsufficient_memory;
break; break;
case CODING_RESULT_SUCCESS:
break;
default: default:
Vlast_code_conversion_error = intern ("Unknown error"); Vlast_code_conversion_error = intern ("Unknown error");
} }
...@@ -1203,7 +1205,6 @@ alloc_destination (coding, nbytes, dst) ...@@ -1203,7 +1205,6 @@ alloc_destination (coding, nbytes, dst)
} }
else else
coding_alloc_by_realloc (coding, nbytes); coding_alloc_by_realloc (coding, nbytes);
record_conversion_result (coding, CODING_RESULT_SUCCESS);
coding_set_destination (coding); coding_set_destination (coding);
dst = coding->destination + offset; dst = coding->destination + offset;
return dst; return dst;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment