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

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/02/22 14:29:27

Modified files:
        src            : ChangeLog insdel.c 

Log message:
        (del_range_2): Don't modify gap contents when called
        from decode_coding_object.  (Bug#1809)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7373&r2=1.7374
http://cvs.savannah.gnu.org/viewcvs/emacs/src/insdel.c?cvsroot=emacs&r1=1.202&r2=1.203

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7373
retrieving revision 1.7374
diff -u -b -r1.7373 -r1.7374
--- ChangeLog   21 Feb 2009 13:38:16 -0000      1.7373
+++ ChangeLog   22 Feb 2009 14:29:25 -0000      1.7374
@@ -1,3 +1,8 @@
+2009-02-22  Andreas Schwab  <address@hidden>
+
+       * insdel.c (del_range_2): Don't modify gap contents when called
+       from decode_coding_object.  (Bug#1809)
+
 2009-02-21  Chong Yidong  <address@hidden>
 
        * data.c (syms_of_data): Define Qfont_spec, Qfont_entity, and

Index: insdel.c
===================================================================
RCS file: /sources/emacs/emacs/src/insdel.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- insdel.c    8 Jan 2009 03:15:44 -0000       1.202
+++ insdel.c    22 Feb 2009 14:29:27 -0000      1.203
@@ -2006,7 +2006,10 @@
   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 ();