diff options
| author | Michael Albinus | 2015-04-29 11:18:25 +0200 |
|---|---|---|
| committer | Michael Albinus | 2015-04-29 11:18:25 +0200 |
| commit | 13cf735fb1c4685c0b4e7a7f8554d2064dc70073 (patch) | |
| tree | 1d2ec670cf3a02a313fd415a196466e1f82686d7 /src/alloc.c | |
| parent | 7fbdb57f801159618f761b8dd510516575b6c5b2 (diff) | |
| parent | 3c0ea587daf8b17960b90603a70e3ac4057d883d (diff) | |
| download | emacs-13cf735fb1c4685c0b4e7a7f8554d2064dc70073.tar.gz emacs-13cf735fb1c4685c0b4e7a7f8554d2064dc70073.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 1f4b1a4694e..688363d06e3 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -4496,7 +4496,7 @@ live_buffer_p (struct mem_node *m, void *p) | |||
| 4496 | must not have been killed. */ | 4496 | must not have been killed. */ |
| 4497 | return (m->type == MEM_TYPE_BUFFER | 4497 | return (m->type == MEM_TYPE_BUFFER |
| 4498 | && p == m->start | 4498 | && p == m->start |
| 4499 | && !NILP (((struct buffer *) p)->INTERNAL_FIELD (name))); | 4499 | && !NILP (((struct buffer *) p)->name_)); |
| 4500 | } | 4500 | } |
| 4501 | 4501 | ||
| 4502 | #endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */ | 4502 | #endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */ |