From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 26 Sep 2022 02:24:35 +0000 (-0400)
Subject: * src/buffer.c (overlays_in): Fix confusion Z-vs-ZV
X-Git-Tag: emacs-29.0.90~1616^2~406^2~53^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a77f09f3ceaafa81cd400fc825f16b194b627b1;p=emacs.git

* src/buffer.c (overlays_in): Fix confusion Z-vs-ZV

This fixes test failures in `test-overlays-in-2` and `test-remove-overlays`.
---

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 7618f5d1e87..7053c2d74f2 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);