aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorKenichi Handa2010-02-18 11:27:25 +0900
committerKenichi Handa2010-02-18 11:27:25 +0900
commitebaf11b608664ec92f82f2da3bb740b6dc880823 (patch)
tree613328b6d378679822410223ac06581e174fc96f /src/coding.c
parent7fb371fec340f903da655d243c02f204a5b60ce4 (diff)
downloademacs-ebaf11b608664ec92f82f2da3bb740b6dc880823.tar.gz
emacs-ebaf11b608664ec92f82f2da3bb740b6dc880823.zip
Fix handling of CODING_RESULT_INSUFFICIENT_DST.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c
index 879cae56194..2144fe5fcd4 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -993,6 +993,11 @@ record_conversion_result (struct coding_system *coding,
993 case CODING_RESULT_INSUFFICIENT_MEM: 993 case CODING_RESULT_INSUFFICIENT_MEM:
994 Vlast_code_conversion_error = Qinsufficient_memory; 994 Vlast_code_conversion_error = Qinsufficient_memory;
995 break; 995 break;
996 case CODING_RESULT_INSUFFICIENT_DST:
997 /* Don't record this error in Vlast_code_conversion_error
998 because it happens just temporarily and is resolved when the
999 whole conversion is finished. */
1000 break;
996 case CODING_RESULT_SUCCESS: 1001 case CODING_RESULT_SUCCESS:
997 break; 1002 break;
998 default: 1003 default:
@@ -7865,7 +7870,7 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte,
7865 if (! destination) 7870 if (! destination)
7866 { 7871 {
7867 record_conversion_result (coding, 7872 record_conversion_result (coding,
7868 CODING_RESULT_INSUFFICIENT_DST); 7873 CODING_RESULT_INSUFFICIENT_MEM);
7869 unbind_to (count, Qnil); 7874 unbind_to (count, Qnil);
7870 return; 7875 return;
7871 } 7876 }