# HG changeset patch # User Kenichi Handa # Date 1266460357 -32400 # Node ID 0d0660dbdea4390ffeb7d28e4698af0a8c1888b9 # Parent 6e6072f0c0a29564851ec8a9b831963f150956db# Parent 3e078e9351151c0cd7092ef225c17be5ce98a7d6 Fix handling of CODING_RESULT_INSUFFICIENT_DST. diff -r 6e6072f0c0a2 -r 0d0660dbdea4 src/ChangeLog --- a/src/ChangeLog Wed Feb 17 16:39:21 2010 -0500 +++ b/src/ChangeLog Thu Feb 18 11:32:37 2010 +0900 @@ -1,3 +1,10 @@ +2010-02-18 Kazuhiro Ito (tiny change) + + * coding.c (record_conversion_result): Handle + CODING_RESULT_INSUFFICIENT_DST. + (decode_coding_object): Record CODING_RESULT_INSUFFICIENT_MEM on + memory allocation error. + 2010-02-17 Kenichi Handa * coding.c (decode_coding_ccl): Don't setup ccl program here. Fix diff -r 6e6072f0c0a2 -r 0d0660dbdea4 src/coding.c --- a/src/coding.c Wed Feb 17 16:39:21 2010 -0500 +++ b/src/coding.c Thu Feb 18 11:32:37 2010 +0900 @@ -993,6 +993,11 @@ case CODING_RESULT_INSUFFICIENT_MEM: Vlast_code_conversion_error = Qinsufficient_memory; break; + case CODING_RESULT_INSUFFICIENT_DST: + /* Don't record this error in Vlast_code_conversion_error + because it happens just temporarily and is resolved when the + whole conversion is finished. */ + break; case CODING_RESULT_SUCCESS: break; default: @@ -7865,7 +7870,7 @@ if (! destination) { record_conversion_result (coding, - CODING_RESULT_INSUFFICIENT_DST); + CODING_RESULT_INSUFFICIENT_MEM); unbind_to (count, Qnil); return; }