Commit 9391e591 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(insert_from_string): Pass extra arg to graft_intervals_into_buffer.

New arg INHERIT.
(insert_from_string_before_markers): New arg INHERIT.
parent 3fe53836
...@@ -327,9 +327,10 @@ insert (string, length) ...@@ -327,9 +327,10 @@ insert (string, length)
before we bcopy the stuff into the buffer, and relocate the string before we bcopy the stuff into the buffer, and relocate the string
without insert noticing. */ without insert noticing. */
insert_from_string (string, pos, length) insert_from_string (string, pos, length, inherit)
Lisp_Object string; Lisp_Object string;
register int pos, length; register int pos, length;
int inherit;
{ {
register Lisp_Object temp; register Lisp_Object temp;
struct gcpro gcpro1; struct gcpro gcpro1;
...@@ -366,7 +367,7 @@ insert_from_string (string, pos, length) ...@@ -366,7 +367,7 @@ insert_from_string (string, pos, length)
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
graft_intervals_into_buffer (XSTRING (string)->intervals, point, graft_intervals_into_buffer (XSTRING (string)->intervals, point,
current_buffer); current_buffer, inherit);
SET_PT (point + length); SET_PT (point + length);
...@@ -407,12 +408,13 @@ insert_before_markers (string, length) ...@@ -407,12 +408,13 @@ insert_before_markers (string, length)
/* Insert part of a Lisp string, relocating markers after. */ /* 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; Lisp_Object string;
register int pos, length; register int pos, length;
int inherit;
{ {
register int opoint = point; register int opoint = point;
insert_from_string (string, pos, length); insert_from_string (string, pos, length, inherit);
adjust_markers (opoint - 1, opoint, length); adjust_markers (opoint - 1, opoint, length);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment