diff options
| author | Paul Eggert | 2012-04-15 23:40:21 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-15 23:40:21 -0700 |
| commit | 5927b310c82f61ab3483fab0407032d2a57b56a3 (patch) | |
| tree | fb2e7db002b406e6f649cdef978789a8ac40e5f7 /src/ChangeLog | |
| parent | 5c6858167926225cc78d3a5ccaee71185f4c0c95 (diff) | |
| parent | 4b5afbb0d98ba4a95359ca5edaee8c3ecd7ae007 (diff) | |
| download | emacs-5927b310c82f61ab3483fab0407032d2a57b56a3.tar.gz emacs-5927b310c82f61ab3483fab0407032d2a57b56a3.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1f242d74df1..7362bf462a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | GC_MALLOC_CHECK) && GC_MALLOC_CHECK), to match when it's used. | 8 | GC_MALLOC_CHECK) && GC_MALLOC_CHECK), to match when it's used. |
| 9 | (NEED_MEM_INSERT): New macro. | 9 | (NEED_MEM_INSERT): New macro. |
| 10 | (mem_insert, mem_insert_fixup) [!NEED_MEM_INSERT]: Remove; unused. | 10 | (mem_insert, mem_insert_fixup) [!NEED_MEM_INSERT]: Remove; unused. |
| 11 | Remove one incorrect comment and fix another. | ||
| 11 | 12 | ||
| 12 | Fix minor ralloc.c problems found by static checking. | 13 | Fix minor ralloc.c problems found by static checking. |
| 13 | See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html | 14 | See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html |