From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 3 Sep 1995 18:51:47 +0000 (+0000)
Subject: (adjust_markers_for_insert): New function.
X-Git-Tag: emacs-19.34~2863
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=beecb55b9eaa374924a9dc34a9ea372e45c3d972;p=emacs.git

(adjust_markers_for_insert): New function.
(insert_from_buffer_1, insert_from_string_1, insert_1): Call it.
---

diff --git a/src/insdel.c b/src/insdel.c
index 2a6438b9bcb..cd46d0f4dcf 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -246,6 +246,26 @@ adjust_markers (from, to, amount)
     }
 }
 
+/* Adjust markers whose insertion-type is t
+   for an insertion of AMOUNT characters at POS.  */
+
+static void
+adjust_markers_for_insert (pos, amount)
+     register int pos, amount;
+{
+  Lisp_Object marker;
+
+  marker = BUF_MARKERS (current_buffer);
+
+  while (!NILP (marker))
+    {
+      register struct Lisp_Marker *m = XMARKER (marker);
+      if (m->insertion_type && m->bufpos == pos)
+	m->bufpos += amount;
+      marker = m->chain;
+    }
+}
+
 /* Add the specified amount to point.  This is used only when the value
    of point changes due to an insert or delete; it does not represent
    a conceptual change in point as a marker.  In particular, point is
@@ -377,6 +397,7 @@ insert_1 (string, length, inherit, prepare)
   ZV += length;
   Z += length;
   adjust_overlays_for_insert (PT, length);
+  adjust_markers_for_insert (PT, length);
   adjust_point (length);
 
 #ifdef USE_TEXT_PROPERTIES
@@ -444,6 +465,7 @@ insert_from_string_1 (string, pos, length, inherit)
   ZV += length;
   Z += length;
   adjust_overlays_for_insert (PT, length);
+  adjust_markers_for_insert (PT, length);
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
   graft_intervals_into_buffer (XSTRING (string)->intervals, PT, length,
@@ -519,6 +541,7 @@ insert_from_buffer_1 (buf, pos, length, inherit)
   ZV += length;
   Z += length;
   adjust_overlays_for_insert (PT, length);
+  adjust_markers_for_insert (PT, length);
   adjust_point (length);
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */