diff options
| author | Joakim Verona | 2013-08-21 09:22:05 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-21 09:22:05 +0200 |
| commit | c9cfa8679176a2b74722f242a7a3c1fbd19d5097 (patch) | |
| tree | 039edbc50123bdb4fd5b6a0d8ee3f81ccd6ebd7f /src/ChangeLog | |
| parent | 194dcc0e82397275f6d560ba454774b88e96d929 (diff) | |
| parent | 0c5307b05f8a31204b409756248f30add802377c (diff) | |
| download | emacs-c9cfa8679176a2b74722f242a7a3c1fbd19d5097.tar.gz emacs-c9cfa8679176a2b74722f242a7a3c1fbd19d5097.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c7cceb27a4f..cb552c9d9d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-08-21 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE | ||
| 4 | and GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES. | ||
| 5 | * alloc.c (toplevel): Remove unnecessary nested #if...#endif. | ||
| 6 | (mark_maybe_object) [!GC_MARK_STACK]: Define to emacs_abort | ||
| 7 | to shut up compiler in mark_object. | ||
| 8 | (dump_zombies): Convert to global and add EXTERNALLY_VISIBLE. | ||
| 9 | |||
| 1 | 2013-08-21 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2013-08-21 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | * process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag. | 12 | * process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag. |