diff options
| author | Andreas Schwab <schwab@suse.de> | 2009-02-22 14:29:25 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2009-02-22 14:29:25 +0000 |
| commit | 3f34d5af66316b15c7b45361a17982577d788d7e (patch) | |
| tree | 163a5d26b734cd1c173d5cb8cba39fe8d54d1a0b | |
| parent | 045f1d6ba33d728358ce13de302c08205bfa66bf (diff) | |
| download | emacs-3f34d5af66316b15c7b45361a17982577d788d7e.tar.gz | |
(del_range_2): Don't modify gap contents when called
from decode_coding_object. (Bug#1809)
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/insdel.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b96374be64c..ea8a99f61a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-02-22 Andreas Schwab <schwab@linux-m68k.org> + + * insdel.c (del_range_2): Don't modify gap contents when called + from decode_coding_object. (Bug#1809) + 2009-02-21 Chong Yidong <cyd@stupidchicken.com> * data.c (syms_of_data): Define Qfont_spec, Qfont_entity, and diff --git a/src/insdel.c b/src/insdel.c index d8e9e99d55a..814d1571d39 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -2006,7 +2006,10 @@ del_range_2 (from, from_byte, to, to_byte, ret_string) Z -= nchars_del; GPT = from; GPT_BYTE = from_byte; - if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */ + if (GAP_SIZE > 0 && !current_buffer->text->inhibit_shrinking) + /* Put an anchor, unless called from decode_coding_object which + needs to access the previous gap contents. */ + *(GPT_ADDR) = 0; if (GPT_BYTE < GPT) abort (); |