aboutsummaryrefslogtreecommitdiffstats
path: root/src/intervals.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-12-20 12:49:21 +0400
committerDmitry Antipov2012-12-20 12:49:21 +0400
commit1687fb14cd625aedce869411c841ff3fbf9ca43d (patch)
tree87e830b3cd829676605146a6d2a3d1f23eefc924 /src/intervals.c
parent87523aedc8a36a3be17e2918b0c8bd43cbe3618c (diff)
downloademacs-1687fb14cd625aedce869411c841ff3fbf9ca43d.tar.gz
emacs-1687fb14cd625aedce869411c841ff3fbf9ca43d.zip
* textprop.c (set_text_properties_1): Do not allow NULL interval.
Rename 4th argument since it may be buffer or string. Adjust comment. * intervals.c (graft_intervals_info_buffer): Find an interval here.
Diffstat (limited to 'src/intervals.c')
-rw-r--r--src/intervals.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 1ed93e1302d..807bbbfaa33 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1624,7 +1624,8 @@ graft_intervals_into_buffer (INTERVAL source, ptrdiff_t position,
1624 XSETBUFFER (buf, buffer); 1624 XSETBUFFER (buf, buffer);
1625 set_text_properties_1 (make_number (position), 1625 set_text_properties_1 (make_number (position),
1626 make_number (position + length), 1626 make_number (position + length),
1627 Qnil, buf, 0); 1627 Qnil, buf,
1628 find_interval (tree, position));
1628 } 1629 }
1629 /* Shouldn't be necessary. --Stef */ 1630 /* Shouldn't be necessary. --Stef */
1630 buffer_balance_intervals (buffer); 1631 buffer_balance_intervals (buffer);