procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of CODING_RESULT_INSUFFICIENT_DST.

Browse source
This commit is contained in:
Kenichi Handa 2010-02-18 11:27:25 +09:00
parent 7fb371fec3
commit ebaf11b608
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2010-02-18 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (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 <handa@m17n.org>
* coding.c (decode_coding_ccl): Don't setup ccl program here. Fix

7
src/coding.c
View file

@ -993,6 +993,11 @@ record_conversion_result (struct coding_system *coding,
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 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte,
if (! destination)
{
record_conversion_result (coding,
CODING_RESULT_INSUFFICIENT_DST);
CODING_RESULT_INSUFFICIENT_MEM);
unbind_to (count, Qnil);
return;
}