From: Kim F. Storm <storm@cua.dk>
Date: Mon, 17 May 2004 22:48:07 +0000 (+0000)
Subject: (get_char_property_and_overlay): Use GET_OVERLAYS_AT.
X-Git-Tag: ttn-vms-21-2-B4~6168
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/b5be4dbe9664b278c6c7d1ab782b0e44434f21eb

(get_char_property_and_overlay): Use GET_OVERLAYS_AT.
---

diff --git a/src/textprop.c b/src/textprop.c
index 4f13aefb1b..c8ec008dcb 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -637,30 +637,13 @@ get_char_property_and_overlay (position, prop, object, overlay)
     }
   if (BUFFERP (object))
     {
-      int posn = XINT (position);
       int noverlays;
-      Lisp_Object *overlay_vec, tem;
-      int len;
+      Lisp_Object *overlay_vec;
       struct buffer *obuf = current_buffer;
 
       set_buffer_temp (XBUFFER (object));
 
-      /* First try with room for 40 overlays.  */
-      len = 40;
-      overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
-
-      noverlays = overlays_at (posn, 0, &overlay_vec, &len,
-			       NULL, NULL, 0);
-
-      /* If there are more than 40,
-	 make enough space for all, and try again.  */
-      if (noverlays > len)
-	{
-	  len = noverlays;
-	  overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
-	  noverlays = overlays_at (posn, 0, &overlay_vec, &len,
-				   NULL, NULL, 0);
-	}
+      GET_OVERLAYS_AT (XINT (position), overlay_vec, noverlays, NULL, 0);
       noverlays = sort_overlays (overlay_vec, noverlays, w);
 
       set_buffer_temp (obuf);
@@ -668,7 +651,7 @@ get_char_property_and_overlay (position, prop, object, overlay)
       /* Now check the overlays in order of decreasing priority.  */
       while (--noverlays >= 0)
 	{
-	  tem = Foverlay_get (overlay_vec[noverlays], prop);
+	  Lisp_Object tem = Foverlay_get (overlay_vec[noverlays], prop);
 	  if (!NILP (tem))
 	    {
 	      if (overlay)