[Emacs-diffs] emacs/src ChangeLog coding.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/05/02 11:32:44

Modified files:
        src            : ChangeLog coding.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7526&r2=1.7527
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.c?cvsroot=emacs&r1=1.428&r2=1.429

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7526
retrieving revision 1.7527
diff -u -b -r1.7526 -r1.7527
--- ChangeLog   1 May 2009 12:17:06 -0000       1.7526
+++ ChangeLog   2 May 2009 11:32:42 -0000       1.7527
@@ -1,3 +1,9 @@
+2009-05-02  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z.

Index: coding.c
===================================================================
RCS file: /sources/emacs/emacs/src/coding.c,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- coding.c    22 Apr 2009 04:32:22 -0000      1.428
+++ coding.c    2 May 2009 11:32:44 -0000       1.429
@@ -992,6 +992,8 @@
     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 @@
     }
   else
     coding_alloc_by_realloc (coding, nbytes);
-  record_conversion_result (coding, CODING_RESULT_SUCCESS);
   coding_set_destination (coding);
   dst = coding->destination + offset;
   return dst;