[Emacs-diffs] Changes to emacs/src/msdos.c [lexbind]

[Miles Bader]

Index: emacs/src/msdos.c
diff -c emacs/src/msdos.c:1.173.2.6 emacs/src/msdos.c:1.173.2.7
*** emacs/src/msdos.c:1.173.2.6 Sat May  1 23:46:19 2004
--- emacs/src/msdos.c   Tue Jul  6 09:14:37 2004
***************
*** 1572,1578 ****
        {
        extern Lisp_Object Qmouse_face;
        Lisp_Object mouse_face, overlay, position, *overlay_vec;
!       int len, noverlays, obegv, ozv;;
        struct buffer *obuf;
  
        /* If we get an out-of-range value, return now; avoid an error.  */
--- 1572,1578 ----
        {
        extern Lisp_Object Qmouse_face;
        Lisp_Object mouse_face, overlay, position, *overlay_vec;
!       int noverlays, obegv, ozv;;
        struct buffer *obuf;
  
        /* If we get an out-of-range value, return now; avoid an error.  */
***************
*** 1591,1610 ****
        /* Is this char mouse-active or does it have help-echo?  */
        XSETINT (position, pos);
  
!       /* Put all the overlays we want in a vector in overlay_vec.
!          Store the length in len.  If there are more than 10, make
!          enough space for all, and try again.  */
!       len = 10;
!       overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
!       noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0);
!       if (noverlays > len)
!         {
!           len = noverlays;
!           overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
!           noverlays = overlays_at (pos,
!                                    0, &overlay_vec, &len, NULL, NULL, 0);
!         }
! 
        /* Sort overlays into increasing priority order.  */
        noverlays = sort_overlays (overlay_vec, noverlays, w);
  
--- 1591,1598 ----
        /* Is this char mouse-active or does it have help-echo?  */
        XSETINT (position, pos);
  
!       /* Put all the overlays we want in a vector in overlay_vec. */
!       GET_OVERLAYS_AT (pos, overlay_vec, noverlays, NULL, 0);
        /* Sort overlays into increasing priority order.  */
        noverlays = sort_overlays (overlay_vec, noverlays, w);