[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind] |
Date: |
Tue, 06 Jul 2004 07:12:22 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.754.2.19 emacs/src/xdisp.c:1.754.2.20
*** emacs/src/xdisp.c:1.754.2.19 Tue May 11 02:39:20 2004
--- emacs/src/xdisp.c Tue Jul 6 09:14:39 2004
***************
*** 2734,2752 ****
int noverlays;
int endpos;
Lisp_Object *overlays;
- int len;
int i;
/* Get all overlays at the given position. */
! len = 10;
! overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
! noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
! if (noverlays > len)
! {
! len = noverlays;
! overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
! noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
! }
/* If any of these overlays ends before endpos,
use its ending point instead. */
--- 2734,2743 ----
int noverlays;
int endpos;
Lisp_Object *overlays;
int i;
/* Get all overlays at the given position. */
! GET_OVERLAYS_AT (pos, overlays, noverlays, &endpos, 1);
/* If any of these overlays ends before endpos,
use its ending point instead. */
***************
*** 20834,20840 ****
Lisp_Object object;
Lisp_Object mouse_face = Qnil, overlay = Qnil, position;
Lisp_Object *overlay_vec = NULL;
! int len, noverlays;
struct buffer *obuf;
int obegv, ozv, same_region;
--- 20825,20831 ----
Lisp_Object object;
Lisp_Object mouse_face = Qnil, overlay = Qnil, position;
Lisp_Object *overlay_vec = NULL;
! int noverlays;
struct buffer *obuf;
int obegv, ozv, same_region;
***************
*** 20921,20939 ****
if (BUFFERP (object))
{
! /* Put all the overlays we want in a vector in overlay_vec.
! Store the length in len. If there are more than 40, make
! enough space for all, and try again. */
! len = 40;
! 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);
}
--- 20912,20919 ----
if (BUFFERP (object))
{
! /* 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);
}
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind],
Miles Bader <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/23