1 files changed, 31 insertions, 58 deletions

diff --git a/src/editfns.c b/src/editfns.c
index f3b3cfb7243..4ccf765bd4b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -272,24 +272,6 @@ If you set the marker not to point anywhere, the buffer will have no mark.  */)
 }
 
 
-/* Find all the overlays in the current buffer that touch position POS.
-   Return the number found, and store them in a vector in VEC
-   of length LEN.
-
-   Note: this can return overlays that do not touch POS.  The caller
-   should filter these out. */
-
-static ptrdiff_t
-overlays_around (ptrdiff_t pos, Lisp_Object *vec, ptrdiff_t len)
-{
-  /* Find all potentially rear-advance overlays at (POS - 1).  Find
-     all overlays at POS, so end at (POS + 1).  Find even empty
-     overlays, which due to the way 'overlays-in' works implies that
-     we might also fetch empty overlays starting at (POS + 1).  */
-  return overlays_in (pos - 1, pos + 1, false, &vec, &len,
-		      true, false, NULL);
-}
-
 DEFUN ("get-pos-property", Fget_pos_property, Sget_pos_property, 2, 3, 0,
        doc: /* Return the value of POSITION's property PROP, in OBJECT.
 Almost identical to `get-char-property' except for the following difference:
@@ -315,53 +297,44 @@ at POSITION.  */)
   else
     {
       EMACS_INT posn = XFIXNUM (position);
-      ptrdiff_t noverlays;
-      Lisp_Object *overlay_vec, tem;
+      Lisp_Object tem;
       struct buffer *obuf = current_buffer;
-      USE_SAFE_ALLOCA;
+      struct itree_node *node;
+      struct sortvec items[2];
+      struct buffer *b = XBUFFER (object);
+      struct sortvec *result = NULL;
+      Lisp_Object res = Qnil;
 
-      set_buffer_temp (XBUFFER (object));
-
-      /* First try with room for 40 overlays.  */
-      Lisp_Object overlay_vecbuf[40];
-      noverlays = ARRAYELTS (overlay_vecbuf);
-      overlay_vec = overlay_vecbuf;
-      noverlays = overlays_around (posn, overlay_vec, noverlays);
-
-      /* If there are more than 40,
-	 make enough space for all, and try again.  */
-      if (ARRAYELTS (overlay_vecbuf) < noverlays)
-	{
-	  SAFE_ALLOCA_LISP (overlay_vec, noverlays);
-	  noverlays = overlays_around (posn, overlay_vec, noverlays);
-	}
-      noverlays = sort_overlays (overlay_vec, noverlays, NULL);
-
-      set_buffer_temp (obuf);
+      set_buffer_temp (b);
 
-      /* Now check the overlays in order of decreasing priority.  */
-      while (--noverlays >= 0)
+      ITREE_FOREACH (node, b->overlays, posn - 1, posn + 1, ASCENDING)
 	{
-	  Lisp_Object ol = overlay_vec[noverlays];
+	  Lisp_Object ol = node->data;
 	  tem = Foverlay_get (ol, prop);
-	  if (!NILP (tem))
-	    {
+	  if (NILP (tem)
 	      /* Check the overlay is indeed active at point.  */
-	      if ((OVERLAY_START (ol) == posn
+	      || ((node->begin == posn
 		   && OVERLAY_FRONT_ADVANCE_P (ol))
-		  || (OVERLAY_END (ol) == posn
+		  || (node->end == posn
 		      && ! OVERLAY_REAR_ADVANCE_P (ol))
-		  || OVERLAY_START (ol) > posn
-		  || OVERLAY_END (ol) < posn)
-		; /* The overlay will not cover a char inserted at point.  */
-	      else
-		{
-		  SAFE_FREE ();
-		  return tem;
-		}
-	    }
+		  || node->begin > posn
+		  || node->end < posn))
+	    /* The overlay will not cover a char inserted at point.  */
+	    continue;
+
+	  struct sortvec *this = (result == items ? items + 1 : items);
+          if (NILP (res)
+              || (make_sortvec_item (this, node->data),
+                  compare_overlays (result, this) < 0))
+            {
+              result = this;
+              res = tem;
+            }
 	}
-      SAFE_FREE ();
+      set_buffer_temp (obuf);
+
+      if (!NILP (res))
+        return res;
 
       { /* Now check the text properties.  */
 	int stickiness = text_property_stickiness (prop, position, object);
@@ -1908,7 +1881,7 @@ determines whether case is significant or ignored.  */)
 #define USE_HEURISTIC
 
 #define XVECREF_YVECREF_EQUAL(ctx, xoff, yoff)  \
-  buffer_chars_equal ((ctx), (xoff), (yoff))
+  buffer_chars_equal (ctx, xoff, yoff)
 
 #define OFFSET ptrdiff_t
 
@@ -2877,9 +2850,9 @@ void
 labeled_narrow_to_region (Lisp_Object begv, Lisp_Object zv,
 			  Lisp_Object label)
 {
-  Finternal__labeled_narrow_to_region (begv, zv, label);
   record_unwind_protect (restore_point_unwind, Fpoint_marker ());
   record_unwind_protect (unwind_labeled_narrow_to_region, label);
+  Finternal__labeled_narrow_to_region (begv, zv, label);
 }
 
 DEFUN ("widen", Fwiden, Swiden, 0, 0, "",