mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
(insert_from_string): Pass extra arg to graft_intervals_into_buffer.
New arg INHERIT. (insert_from_string_before_markers): New arg INHERIT.
This commit is contained in:
parent
3fe5383642
commit
9391e59130
10
src/insdel.c
10
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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user