Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-301
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-302
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-303
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-304
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-305
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-306
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-307
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-308
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-309
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-310
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-311
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-312
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-313
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-314
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-315
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-316
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-317
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-318
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-319
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-320
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-321
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-322
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-323
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-324
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-163

1 files changed, 3 insertions, 20 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 4f13aefb1be..c8ec008dcbd 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)