diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/alloc.c b/src/alloc.c index 5b2553c69cc..f04f3c05134 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -4424,7 +4424,7 @@ live_buffer_p (struct mem_node *m, void *p) | |||
| 4424 | must not have been killed. */ | 4424 | must not have been killed. */ |
| 4425 | return (m->type == MEM_TYPE_BUFFER | 4425 | return (m->type == MEM_TYPE_BUFFER |
| 4426 | && p == m->start | 4426 | && p == m->start |
| 4427 | && !NILP (((struct buffer *) p)->BUFFER_INTERNAL_FIELD (name))); | 4427 | && !NILP (((struct buffer *) p)->INTERNAL_FIELD (name))); |
| 4428 | } | 4428 | } |
| 4429 | 4429 | ||
| 4430 | #endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */ | 4430 | #endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */ |
| @@ -5549,10 +5549,10 @@ See Info node `(elisp)Garbage Collection'. */) | |||
| 5549 | turned off in that buffer. Calling truncate_undo_list on | 5549 | turned off in that buffer. Calling truncate_undo_list on |
| 5550 | Qt tends to return NULL, which effectively turns undo back on. | 5550 | Qt tends to return NULL, which effectively turns undo back on. |
| 5551 | So don't call truncate_undo_list if undo_list is Qt. */ | 5551 | So don't call truncate_undo_list if undo_list is Qt. */ |
| 5552 | if (! EQ (nextb->BUFFER_INTERNAL_FIELD (undo_list), Qt)) | 5552 | if (! EQ (nextb->INTERNAL_FIELD (undo_list), Qt)) |
| 5553 | { | 5553 | { |
| 5554 | Lisp_Object tail, prev; | 5554 | Lisp_Object tail, prev; |
| 5555 | tail = nextb->BUFFER_INTERNAL_FIELD (undo_list); | 5555 | tail = nextb->INTERNAL_FIELD (undo_list); |
| 5556 | prev = Qnil; | 5556 | prev = Qnil; |
| 5557 | while (CONSP (tail)) | 5557 | while (CONSP (tail)) |
| 5558 | { | 5558 | { |
| @@ -5561,7 +5561,7 @@ See Info node `(elisp)Garbage Collection'. */) | |||
| 5561 | && !XMARKER (XCAR (XCAR (tail)))->gcmarkbit) | 5561 | && !XMARKER (XCAR (XCAR (tail)))->gcmarkbit) |
| 5562 | { | 5562 | { |
| 5563 | if (NILP (prev)) | 5563 | if (NILP (prev)) |
| 5564 | nextb->BUFFER_INTERNAL_FIELD (undo_list) = tail = XCDR (tail); | 5564 | nextb->INTERNAL_FIELD (undo_list) = tail = XCDR (tail); |
| 5565 | else | 5565 | else |
| 5566 | { | 5566 | { |
| 5567 | tail = XCDR (tail); | 5567 | tail = XCDR (tail); |
| @@ -5577,7 +5577,7 @@ See Info node `(elisp)Garbage Collection'. */) | |||
| 5577 | } | 5577 | } |
| 5578 | /* Now that we have stripped the elements that need not be in the | 5578 | /* Now that we have stripped the elements that need not be in the |
| 5579 | undo_list any more, we can finally mark the list. */ | 5579 | undo_list any more, we can finally mark the list. */ |
| 5580 | mark_object (nextb->BUFFER_INTERNAL_FIELD (undo_list)); | 5580 | mark_object (nextb->INTERNAL_FIELD (undo_list)); |
| 5581 | } | 5581 | } |
| 5582 | 5582 | ||
| 5583 | gc_sweep (); | 5583 | gc_sweep (); |