diff options
| author | Richard M. Stallman | 1994-09-21 06:25:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-09-21 06:25:26 +0000 |
| commit | 59a486aba0b1e9a4993b35246844676e9b0f2215 (patch) | |
| tree | 022716d46a33a37352eac3f3012bca9ae2feb073 | |
| parent | 287e500df205e6bdec904a5a628a35b8a273656a (diff) | |
| download | emacs-59a486aba0b1e9a4993b35246844676e9b0f2215.tar.gz emacs-59a486aba0b1e9a4993b35246844676e9b0f2215.zip | |
(Fget_char_property): Pass new arg to overlays_at.
(NULL): Define if not defined.
| -rw-r--r-- | src/textprop.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c index 515838732c8..853aa12c902 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -22,6 +22,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 22 | #include "intervals.h" | 22 | #include "intervals.h" |
| 23 | #include "buffer.h" | 23 | #include "buffer.h" |
| 24 | #include "window.h" | 24 | #include "window.h" |
| 25 | |||
| 26 | #ifndef NULL | ||
| 27 | #define NULL (void *)0 | ||
| 28 | #endif | ||
| 25 | 29 | ||
| 26 | 30 | ||
| 27 | /* NOTES: previous- and next- property change will have to skip | 31 | /* NOTES: previous- and next- property change will have to skip |
| @@ -543,7 +547,8 @@ overlays are considered only if they are associated with OBJECT.") | |||
| 543 | len = 40; | 547 | len = 40; |
| 544 | overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); | 548 | overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); |
| 545 | 549 | ||
| 546 | noverlays = overlays_at (posn, 0, &overlay_vec, &len, &next_overlay); | 550 | noverlays = overlays_at (posn, 0, &overlay_vec, &len, |
| 551 | &next_overlay, NULL); | ||
| 547 | 552 | ||
| 548 | /* If there are more than 40, | 553 | /* If there are more than 40, |
| 549 | make enough space for all, and try again. */ | 554 | make enough space for all, and try again. */ |
| @@ -551,7 +556,8 @@ overlays are considered only if they are associated with OBJECT.") | |||
| 551 | { | 556 | { |
| 552 | len = noverlays; | 557 | len = noverlays; |
| 553 | overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); | 558 | overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); |
| 554 | noverlays = overlays_at (posn, 0, &overlay_vec, &len, &next_overlay); | 559 | noverlays = overlays_at (posn, 0, &overlay_vec, &len, |
| 560 | &next_overlay, NULL); | ||
| 555 | } | 561 | } |
| 556 | noverlays = sort_overlays (overlay_vec, noverlays, w); | 562 | noverlays = sort_overlays (overlay_vec, noverlays, w); |
| 557 | 563 | ||