From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 14 Sep 1993 12:08:02 +0000 (+0000)
Subject: (insert_from_string): Pass extra arg to graft_intervals_into_buffer.
X-Git-Tag: emacs-19.34~11139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9391e59130ca845d2788f6e33bcac6445b9187a9;p=emacs.git

(insert_from_string): Pass extra arg to graft_intervals_into_buffer.
New arg INHERIT.
(insert_from_string_before_markers): New arg INHERIT.
---

diff --git a/src/insdel.c b/src/insdel.c
index e73eee75453..0c13e3a8f8e 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -327,9 +327,10 @@ insert (string, length)
    before we bcopy the stuff into the buffer, and relocate the string
    without insert noticing.  */
 
-insert_from_string (string, pos, length)
+insert_from_string (string, pos, length, inherit)
      Lisp_Object string;
      register int pos, length;
+     int inherit;
 {
   register Lisp_Object temp;
   struct gcpro gcpro1;
@@ -366,7 +367,7 @@ insert_from_string (string, pos, length)
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
   graft_intervals_into_buffer (XSTRING (string)->intervals, point,
-			       current_buffer);
+			       current_buffer, inherit);
 
   SET_PT (point + length);
 
@@ -407,12 +408,13 @@ insert_before_markers (string, length)
 
 /* Insert part of a Lisp string, relocating markers after.  */
 
-insert_from_string_before_markers (string, pos, length)
+insert_from_string_before_markers (string, pos, length, inherit)
      Lisp_Object string;
      register int pos, length;
+     int inherit;
 {
   register int opoint = point;
-  insert_from_string (string, pos, length);
+  insert_from_string (string, pos, length, inherit);
   adjust_markers (opoint - 1, opoint, length);
 }