diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-08-20 07:34:41 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-08-20 07:34:41 -0600 |
| commit | 49bc1a9dfc6e81a370bf12157c3c573743ee200a (patch) | |
| tree | 24df8b040aff367adc11a2c676334ec238651e1d /src/alloc.c | |
| parent | b94de893429bbfbb27572c8c3118fcc876957adb (diff) | |
| parent | a05731a0cc2553af0469bd9b7d6ac10cd2e6a817 (diff) | |
| download | emacs-49bc1a9dfc6e81a370bf12157c3c573743ee200a.tar.gz emacs-49bc1a9dfc6e81a370bf12157c3c573743ee200a.tar.bz2 emacs-49bc1a9dfc6e81a370bf12157c3c573743ee200a.zip | |
Merge from trunk
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index 19b77d567d0..a8830684580 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -5809,7 +5809,7 @@ mark_buffer (struct buffer *buffer) /* ...but there are some buffer-specific things. */ - MARK_INTERVAL_TREE (buffer_get_intervals (buffer)); + MARK_INTERVAL_TREE (buffer_intervals (buffer)); /* For now, we just don't mark the undo_list. It's done later in a special way just before the sweep phase, and after stripping @@ -6063,7 +6063,7 @@ mark_object (Lisp_Object arg) } if (!PURE_POINTER_P (XSTRING (ptr->name))) MARK_STRING (XSTRING (ptr->name)); - MARK_INTERVAL_TREE (string_get_intervals (ptr->name)); + MARK_INTERVAL_TREE (string_intervals (ptr->name)); ptr = ptr->next; if (ptr) @@ -6378,7 +6378,7 @@ gc_sweep (void) { if (!iblk->intervals[i].gcmarkbit) { - interval_set_parent (&iblk->intervals[i], interval_free_list); + set_interval_parent (&iblk->intervals[i], interval_free_list); interval_free_list = &iblk->intervals[i]; this_free++; } |