aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1993-09-14 12:08:02 +0000
committerRichard M. Stallman1993-09-14 12:08:02 +0000
commit9391e59130ca845d2788f6e33bcac6445b9187a9 (patch)
tree2cf8c1d2c3a9625dee974a10aad27f904159db64 /src
parent3fe5383642292d6f7eccec8dec81c7f67109b885 (diff)
downloademacs-9391e59130ca845d2788f6e33bcac6445b9187a9.tar.gz
emacs-9391e59130ca845d2788f6e33bcac6445b9187a9.zip
(insert_from_string): Pass extra arg to graft_intervals_into_buffer.
New arg INHERIT. (insert_from_string_before_markers): New arg INHERIT.
Diffstat (limited to 'src')
-rw-r--r--src/insdel.c10
1 files changed, 6 insertions, 4 deletions
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)
327 before we bcopy the stuff into the buffer, and relocate the string 327 before we bcopy the stuff into the buffer, and relocate the string
328 without insert noticing. */ 328 without insert noticing. */
329 329
330insert_from_string (string, pos, length) 330insert_from_string (string, pos, length, inherit)
331 Lisp_Object string; 331 Lisp_Object string;
332 register int pos, length; 332 register int pos, length;
333 int inherit;
333{ 334{
334 register Lisp_Object temp; 335 register Lisp_Object temp;
335 struct gcpro gcpro1; 336 struct gcpro gcpro1;
@@ -366,7 +367,7 @@ insert_from_string (string, pos, length)
366 367
367 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ 368 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
368 graft_intervals_into_buffer (XSTRING (string)->intervals, point, 369 graft_intervals_into_buffer (XSTRING (string)->intervals, point,
369 current_buffer); 370 current_buffer, inherit);
370 371
371 SET_PT (point + length); 372 SET_PT (point + length);
372 373
@@ -407,12 +408,13 @@ insert_before_markers (string, length)
407 408
408/* Insert part of a Lisp string, relocating markers after. */ 409/* Insert part of a Lisp string, relocating markers after. */
409 410
410insert_from_string_before_markers (string, pos, length) 411insert_from_string_before_markers (string, pos, length, inherit)
411 Lisp_Object string; 412 Lisp_Object string;
412 register int pos, length; 413 register int pos, length;
414 int inherit;
413{ 415{
414 register int opoint = point; 416 register int opoint = point;
415 insert_from_string (string, pos, length); 417 insert_from_string (string, pos, length, inherit);
416 adjust_markers (opoint - 1, opoint, length); 418 adjust_markers (opoint - 1, opoint, length);
417} 419}
418 420