From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 26 Nov 1999 12:07:04 +0000 (+0000)
Subject: (insert_1_both): Call set_text_properties with last
X-Git-Tag: emacs-pretest-21.0.90~5968
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2cab2ea4abd6d4dddb57ed51a9dffa56b3ca633;p=emacs.git

(insert_1_both): Call set_text_properties with last
parameter nil so that no after changes will be signaled.
---

diff --git a/src/insdel.c b/src/insdel.c
index 05c86616c1d..f9b38602357 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -568,8 +568,9 @@ adjust_markers_for_replace (from, from_byte, old_chars, old_bytes,
 	    }
 	  else
 	    {
-	      m->charpos += diff_chars;
-	      m->bytepos += diff_bytes;
+	      m->charpos = min (from + new_chars, m->charpos + diff_chars);
+	      m->bytepos = min (from_byte + new_bytes,
+				m->bytepos + diff_bytes);
 	    }
 	}
       else if (m->bytepos >= from_byte)
@@ -1188,8 +1189,8 @@ insert_1_both (string, nchars, nbytes, inherit, prepare, before_markers)
     offset_intervals (current_buffer, PT, nchars);
 
   if (!inherit && BUF_INTERVALS (current_buffer) != 0)
-    Fset_text_properties (make_number (PT), make_number (PT + nchars),
-			  Qnil, Qnil);
+    set_text_properties (make_number (PT), make_number (PT + nchars),
+			 Qnil, Qnil, Qnil);
 
   {
     int pos = PT, pos_byte = PT_BYTE;