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

2 files changed, 2 insertions, 5 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 1bb2af98e75..2b1997fc8be 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -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;
         }
 
diff --git a/src/pdumper.c b/src/pdumper.c
index 6c8c2131794..79644c01517 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -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);