1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 20:00:36 -08:00

Merge from trunk.

This commit is contained in:
Paul Eggert 2011-11-18 23:15:21 -08:00
commit 9898bd0e5b
594 changed files with 5790 additions and 4751 deletions

View file

@ -1043,7 +1043,7 @@ coding_set_destination (struct coding_system *coding)
{
if (BUFFERP (coding->dst_object))
{
if (coding->src_pos < 0)
if (BUFFERP (coding->src_object) && coding->src_pos < 0)
{
coding->destination = BEG_ADDR + coding->dst_pos_byte - BEG_BYTE;
coding->dst_bytes = (GAP_END_ADDR