Mercurial > emacs
changeset 107282:5937202fb760
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 18 Feb 2010 02:46:55 +0000 |
| parents | e8f3e6f246f6 (current diff) 0d0660dbdea4 (diff) |
| children | 396dc65ad74c |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 17 22:09:13 2010 +0000 +++ b/src/ChangeLog Thu Feb 18 02:46:55 2010 +0000 @@ -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
--- a/src/coding.c Wed Feb 17 22:09:13 2010 +0000 +++ b/src/coding.c Thu Feb 18 02:46:55 2010 +0000 @@ -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; }