# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1266461215 0
# Node ID 5937202fb760672df299eaa72527c1579f3e86e9
# Parent  e8f3e6f246f63dc1ee67bc52a0610236dc10034c# Parent  0d0660dbdea4390ffeb7d28e4698af0a8c1888b9
Merge from mainline.

diff -r e8f3e6f246f6 -r 5937202fb760 src/ChangeLog
--- 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
diff -r e8f3e6f246f6 -r 5937202fb760 src/coding.c
--- 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;
 	    }