[Emacs-diffs] /srv/bzr/emacs/trunk r99514: Fix handling of CODING_RESULT_INSUFFICIENT_DST.

[Kenichi Handa]

------------------------------------------------------------
revno: 99514 [merge]
committer: Kenichi Handa  <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-18 11:32:37 +0900
message:
  Fix handling of CODING_RESULT_INSUFFICIENT_DST.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-02-17 06:47:32 +0000
+++ b/src/ChangeLog     2010-02-18 02:27:25 +0000
@@ -1,3 +1,10 @@
+2010-02-18  Kazuhiro Ito  <address@hidden>  (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  <address@hidden>
 
        * coding.c (decode_coding_ccl): Don't setup ccl program here.  Fix

=== modified file 'src/coding.c'
--- a/src/coding.c      2010-02-17 06:47:32 +0000
+++ b/src/coding.c      2010-02-18 02:27:25 +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;
            }