mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 04:10:27 -08:00
Code Issues Projects Releases Wiki Activity

Arrange to tell redisplay about changes in overlays.

Browse source 
* xdisp.c (redisplay_region): New function.
	* buffer.c (Fmove_overlay): Call redisplay_region on the areas the
	overlay has enclosed or left.
	(Fdelete_overlay): Call redisplay_region on the area the overlay
	used to occupy.
	(Foverlay_put): Call redisplay_region on the area the overlay now
	occupies; we may have put a face property on it.

	* buffer.c (Fmove_overlay): Doc fix.
This commit is contained in:
Jim Blandy 1993-05-10 00:15:02 +00:00
parent 40a4095a69
commit b61982dd6e
1 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/buffer.c
View file

@ -1476,12 +1476,15 @@ BEG and END may be integers or markers.")
/* This puts it in the right list, and in the right order. */
recenter_overlay_lists (b, XINT (b->overlay_center));
/* We don't need to redisplay the region covered by the overlay, because
the overlay has no properties at the moment. */
return overlay;
}
DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0,
"Set the endpoints of OVERLAY to BEG and END in BUFFER.\n\
If omitted, don't change OVERLAY's buffer.")
If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now.")
(overlay, beg, end, buffer)
Lisp_Object overlay, beg, end, buffer;
{
@ -1494,8 +1497,38 @@ If omitted, don't change OVERLAY's buffer.")
buffer = Fmarker_buffer (OVERLAY_START (overlay));
CHECK_BUFFER (buffer, 3);
CHECK_NUMBER_COERCE_MARKER (beg, 1);
CHECK_NUMBER_COERCE_MARKER (end, 1);
if (XINT (beg) > XINT (end))
{
Lisp_Object temp = beg;
beg = end; end = temp;
}
b = XBUFFER (buffer);
/* Redisplay the area the overlay has just left, or just enclosed. */
{
Lisp_Object o_beg = OVERLAY_START (overlay);
Lisp_Object o_end = OVERLAY_END (overlay);
int change_beg, change_end;
o_beg = OVERLAY_POSITION (o_beg);
o_end = OVERLAY_POSITION (o_end);
if (XINT (o_beg) == XINT (beg))
redisplay_region (b, XINT (o_end), XINT (end));
else if (XINT (o_end) == XINT (end))
redisplay_region (b, XINT (o_beg), XINT (beg));
else
{
if (XINT (beg) < XINT (o_beg)) o_beg = beg;
if (XINT (end) > XINT (o_end)) o_end = end;
redisplay_region (b, XINT (o_beg), XINT (o_end));
}
}
b->overlays_before = Fdelq (overlay, b->overlays_before);
b->overlays_after = Fdelq (overlay, b->overlays_after);
@ -1531,6 +1564,10 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0,
b->overlays_before = Fdelq (overlay, b->overlays_before);
b->overlays_after = Fdelq (overlay, b->overlays_after);
redisplay_region (b,
OVERLAY_POSITION (OVERLAY_START (overlay)),
OVERLAY_POSITION (OVERLAY_END (overlay)));
return Qnil;
}
@ -1656,6 +1693,13 @@ DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
{
Lisp_Object plist, tail;
if (!OVERLAY_VALID (overlay))
error ("Invalid overlay object");
redisplay_region (XMARKER (OVERLAY_START (overlay))->buffer,
OVERLAY_POSITION (OVERLAY_START (overlay)),
OVERLAY_POSITION (OVERLAY_END (overlay)));
plist = Fcdr_safe (Fcdr_safe (overlay));
for (tail = plist;