1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fabbcbef40d..767dfa47036 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,25 @@
 2012-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Clean up __executable_start, monstartup when --enable-profiling.
+        The following changes affect the code only when profiling.
+        * dispnew.c (__executable_start): Rename from safe_bcopy.
+        Define only on platforms that need it.
+        * emacs.c: Include <sys/gmon.h> when profiling.
+        (_mcleanup): Remove decl, since <sys/gmon.h> does it now.
+        (__executable_start): Remove decl, since lisp.h does it now.
+        (safe_bcopy): Remove decl; no longer has that name.
+        (main): Coalesce #if into single bit of code, for simplicity.
+        Cast pointers to uintptr_t, since standard libraries want integers
+        and not pointers.
+        * lisp.h (__executable_start): New decl.
+
+2012-05-30  Jim Meyering  <meyering@redhat.com>
+
+        * callproc.c (Fcall_process_region): Include directory component
+        in mkstemp error message (Bug#11586).
+
+2012-05-30  Paul Eggert  <eggert@cs.ucla.edu>
+
         * alloc.c, lisp.h (make_pure_vector): Now static.
 
 2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>