1 files changed, 52 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a58d0b5905..5acc6313bbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2006-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.c (x_set_border_width): Remove #ifndef MAC_OS.
+
+        * image.c [MAC_OS] (gif_load): Allocate Lisp string first.
+
+        * macfns.c (Fx_focus_frame): Don't check dpyinfo->x_focus_frame.
+
+        * macterm.c (XTread_socket) [TARGET_API_MAC_CARBON && MAC_OSX]:
+        Forward keyUp events to toolbox_dispatcher.
+
+        * window.c (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
+
+2006-05-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * config.in: Regenerated (HAVE_ALSA).
+
+        * sound.c (alsa_sound_perror, alsa_open, alsa_period_size)
+        (alsa_configure, alsa_close, alsa_choose_format, alsa_write)
+        (snd_error_quiet, alsa_init): New functions.
+        (vox_init): Return 0 if unable to open device.
+        (Fplay_sound_internal): Test for alsa first and use vox (oss) as
+        a fallback.
+        (struct sound_device): Add period_size.
+        (wav_play, au_play): Use period_size if set.
+
+        * Makefile.in (CFLAGS_SOUND): New flags for ALSA
+        (ALL_CFLAGS): Add CFLAGS_SOUND
+
+2006-05-18  Kenichi Handa  <handa@m17n.org>
+
+        * callproc.c (Fcall_process): Reject encoding arguments by
+        ascii-incompatible coding systems (e.g. utf-16).
+
+        * coding.c (Qascii_incompatible): New variable.
+        (syms_of_coding): Setup Qascii_incompatible.
+        (setup_coding_system): Be sure to initialize coding->common_flags.
+        Check `ascii-incompatible' property of the coding system.
+
+        * coding.h (CODING_ASCII_INCOMPATIBLE_MASK): New macro.
+
+2006-05-18  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_tool_bar_line): Restore entire tool-bar geometry when
+        backtracking in case last image doesn't fit on line.
+
+2006-05-18  MIYOSHI Masanori <miyoshi@meadowy.org>  (tiny change)
+
+        * xdisp.c (display_tool_bar_line): Don't adjust tool-bar height by more than
+        height of one frame default line.
+
 2006-05-16  Kim F. Storm  <storm@cua.dk>
 
         * xterm.c (handle_one_xevent): Check that f is not NULL before
@@ -17012,8 +17063,7 @@
         (Fapropos_internal): Initialize them and clear them out.
         Don't GCPRO them.
 
-        * buffer.c (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>:
-        Doc fixes.
+        * buffer.c (syms_of_buffer) <scroll-up|down-aggressively>: Doc fixes.
 
         * lisp.h: New misc type Lisp_Save_Value.
         (enum Lisp_Misc_Type): Add Lisp_Misc_Save_Value.