mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 07:11:34 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/scratch/noverlay-wip' into noverlay

Browse source
This commit is contained in:
Stefan Monnier 2022-09-28 11:57:16 -04:00
commit 800ecd4767
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/buffer.c
View file

@ -2933,7 +2933,7 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend,
buffer_overlay_iter_start (current_buffer, beg,
/* Find empty OV at Z ? */
(end >= Z && empty) ? Z + 1 : ZV,
(end >= ZV && empty) ? ZV + 1 : ZV,
ITREE_ASCENDING);
while ((node = buffer_overlay_iter_next (current_buffer)))
@ -2946,7 +2946,7 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend,
else if (node->begin == end)
{
next = node->begin;
if ((! empty || end < Z) && beg < end)
if ((! empty || end < ZV) && beg < end)
break;
}

3
src/pdumper.c
View file

@ -2871,9 +2871,6 @@ dump_buffer (struct dump_context *ctx, const struct buffer *in_buffer)
else
out->overlays = NULL;
/* dump_field_lv_rawptr (ctx, out, buffer, &buffer->overlays,
?Lisp_Vectorlike?, WEIGHT_NORMAL); */
dump_field_lv (ctx, out, buffer, &buffer->undo_list_,
WEIGHT_STRONG);
dump_off offset = finish_dump_pvec (ctx, &out->header);