(record_conversion_result): Don't modify

Vlast_code_conversion_error for successful result.
(alloc_destination): Don't clobber conversion result.  (Bug#1650)

diff --git a/src/ChangeLog b/src/ChangeLog
index 72f050cb1704dd4fbd442250d91b64a37a9be600..4ba1d7fae650d68cef989b0d51f274c1ca109793 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-02  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * coding.c (record_conversion_result): Don't modify
+       Vlast_code_conversion_error for successful result.
+       (alloc_destination): Don't clobber conversion result.  (Bug#1650)
+
 2009-05-01  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
 
        * charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z.

diff --git a/src/coding.c b/src/coding.c
index d374ca8b476bb1987805b1ab75c5ec64423e56db..23690bc753b8ebdb952ae8c7e37eebc28ffebdd0 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -992,6 +992,8 @@ record_conversion_result (struct coding_system *coding,
     case CODING_RESULT_INSUFFICIENT_MEM:
       Vlast_code_conversion_error = Qinsufficient_memory;
       break;
+    case CODING_RESULT_SUCCESS:
+      break;
     default:
       Vlast_code_conversion_error = intern ("Unknown error");
     }
@@ -1203,7 +1205,6 @@ alloc_destination (coding, nbytes, dst)
     }
   else
     coding_alloc_by_realloc (coding, nbytes);
-  record_conversion_result (coding, CODING_RESULT_SUCCESS);
   coding_set_destination (coding);
   dst = coding->destination + offset;
   return dst;