1 files changed, 18 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 09631c23e61..e07c4696c9e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2007-08-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * gmalloc.c (posix_memalign): New function.
+
+        * macterm.c (frame_highlight, frame_unhighlight): Don't call
+        ActivateControl/DeactivateControl here.
+        [USE_MAC_TOOLBAR] (free_frame_tool_bar): Suppress animation when
+        frame-notice-user-settings is non-nil.
+        [USE_MAC_FONT_PANEL] (mac_handle_font_event): Also record parameter
+        for kEventParamFMFontStyle.
+        [TARGET_API_MAC_CARBON] (mac_handle_keyboard_event): Don't check
+        mac_pass_command_to_system and mac_pass_control_to_system here.
+        (XTread_socket): Call ActivateControl/DeactivateControl here.
+        (XTread_socket) [TARGET_API_MAC_CARBON]:
+        Check mac_pass_command_to_system and mac_pass_control_to_system here.
+
 2007-08-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (move_it_by_lines): Remove incorrect optimization.
@@ -20,8 +36,8 @@
         Call malloc_enable_thread on interactive startup.
 
         * gmalloc.c (_malloc_thread_enabled_p) [USE_PTHREAD]: New variable.
-        [USE_PTHREAD] (LOCK, UNLOCK, LOCK_ALIGNED_BLOCKS)
-        (UNLOCK_ALIGNED_BLOCKS): Conditionalize with it.
+        (LOCK, UNLOCK, LOCK_ALIGNED_BLOCKS, UNLOCK_ALIGNED_BLOCKS)
+        [USE_PTHREAD]: Conditionalize with it.
         (malloc_atfork_handler_prepare, malloc_atfork_handler_parent)
         (malloc_atfork_handler_child, malloc_enable_thread) [USE_PTHREAD]:
         New functions.