1 files changed, 45 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 11fe6f910e4..db10f46024b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,48 @@
+2006-03-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * window.c: Declare preserve_y as a static global variable.
+        (window_scroll_pixel_based): No longer declare preserve_y;
+        it is global now.
+        (syms_of_window): set preserve_y to -1.
+
+2006-03-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c [MAC_OS] (XPutPixel): Set alpha channel bits if pixmap
+        depth is 32.
+         [MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
+        depth is 32.
+
+2006-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (handle_invisible_prop): Don't update it->position with
+        a buffer position if we're in a display string.
+
+2006-03-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.h (MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH)
+        (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH): New defines.
+
+        * macfns.c (x_default_scroll_bar_color_parameter)
+        (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Remove
+        unnecessary prototypes.
+        (x_set_scroll_bar_default_width): Use
+        MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH.
+        (mac_set_scroll_bar_width): New function.
+        (mac_frame_parm_handlers): Set it as handler for scroll-bar-width.
+
+        * macterm.c (get_control_part_bounds): Fix type of return value.
+        (x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
+        (XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: Don't show
+        scroll bar if it is not tall enough to display scroll bar thumb.
+        [USE_CARBON_EVENTS] (mac_convert_event_ref)
+        (mac_handle_command_event, mac_handle_window_event)
+        (mac_handle_mouse_event): Check error code of GetEventParameter.
+        (convert_fn_keycode) [MAC_OSX]: Likewise.
+        
+2006-03-05  Andreas Schwab  <schwab@suse.de>
+
+        * xselect.c (x_catch_errors_unwind): Fix missing return value.
+
 2006-03-02  Kim F. Storm  <storm@cua.dk>
 
         * frame.h (struct frame): New member n_tool_bar_rows.