mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

(record_conversion_result): Don't modify

Browse source 
Vlast_code_conversion_error for successful result.
(alloc_destination): Don't clobber conversion result.  (Bug#1650)
This commit is contained in:
Andreas Schwab 2009-05-02 11:32:42 +00:00
parent 36fc09321b
commit 409ea3a1dd
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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) 2009-05-01 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z. * charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z.

3
src/coding.c
View file

@ -992,6 +992,8 @@ record_conversion_result (struct coding_system *coding,
case CODING_RESULT_INSUFFICIENT_MEM: case CODING_RESULT_INSUFFICIENT_MEM:
Vlast_code_conversion_error = Qinsufficient_memory; Vlast_code_conversion_error = Qinsufficient_memory;
break; break;
case CODING_RESULT_SUCCESS:
break;
default: default:
Vlast_code_conversion_error = intern ("Unknown error"); Vlast_code_conversion_error = intern ("Unknown error");
} }
@ -1203,7 +1205,6 @@ alloc_destination (coding, nbytes, dst)
} }
else else
coding_alloc_by_realloc (coding, nbytes); coding_alloc_by_realloc (coding, nbytes);
record_conversion_result (coding, CODING_RESULT_SUCCESS);
coding_set_destination (coding); coding_set_destination (coding);
dst = coding->destination + offset; dst = coding->destination + offset;
return dst; return dst;