diff options
| author | Paul Eggert | 2011-07-08 02:38:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-08 02:38:32 -0700 |
| commit | 1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615 (patch) | |
| tree | 16046f0d8917f94dec1d0a4dc8316e657a00ae1f /src/alloc.c | |
| parent | 8a6ebd580bafa45ca1d8cc6294ea91facacfdbe0 (diff) | |
| parent | a63e0781250f31d99360209d9053d380d6fe0815 (diff) | |
| download | emacs-1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615.tar.gz emacs-1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615.zip | |
Merge from trunk.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 43befd722bb..f679787e95c 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -5619,7 +5619,8 @@ mark_buffer (Lisp_Object buf) | |||
| 5619 | /* buffer-local Lisp variables start at `undo_list', | 5619 | /* buffer-local Lisp variables start at `undo_list', |
| 5620 | tho only the ones from `name' on are GC'd normally. */ | 5620 | tho only the ones from `name' on are GC'd normally. */ |
| 5621 | for (ptr = &buffer->BUFFER_INTERNAL_FIELD (name); | 5621 | for (ptr = &buffer->BUFFER_INTERNAL_FIELD (name); |
| 5622 | (char *)ptr < (char *)buffer + sizeof (struct buffer); | 5622 | ptr <= &PER_BUFFER_VALUE (buffer, |
| 5623 | PER_BUFFER_VAR_OFFSET (LAST_FIELD_PER_BUFFER)); | ||
| 5623 | ptr++) | 5624 | ptr++) |
| 5624 | mark_object (*ptr); | 5625 | mark_object (*ptr); |
| 5625 | 5626 | ||