Mercurial > emacs
diff src/ChangeLog @ 109422:bcedeeedc5fb
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 01 Jul 2010 22:47:18 +0000 |
| parents | 43b10f3ac90c |
| children | ed7496d92467 |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jun 30 22:57:08 2010 +0000 +++ b/src/ChangeLog Thu Jul 01 22:47:18 2010 +0000 @@ -1,3 +1,35 @@ +2010-07-01 Jan Djärv <jan.h.d@swipnet.se> + + * window.c (Fwindow_absolute_pixel_edges): Doc fix. + + * window.c (calc_absolute_offset, Fwindow_absolute_pixel_edges) + (Fwindow_inside_absolute_pixel_edges): New functions (bug#5721). + + * nsfns.m (compute_tip_xy): Do not convert coordinates from frame + parameters, they are already absolute. + + * nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed + FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT. + + * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH + + * nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update + FRAME_TOOLBAR_HEIGHT. + + * nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add + BLOCK/UNBLOCK_INPUT so asserts don't trigger. + +2010-06-30 Chong Yidong <cyd@stupidchicken.com> + + * frame.c (get_future_frame_param, Fmake_terminal_frame): Don't + check default-frame-alist. + +2010-06-30 Andreas Schwab <schwab@linux-m68k.org> + + * process.c (create_process): Avoid using invalid file descriptors. + + * callproc.c (child_setup): Avoid closing a file descriptor twice. + 2010-06-30 Jan Djärv <jan.h.d@swipnet.se> * xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font): @@ -77,7 +109,7 @@ properties instead to get old x and y position. (xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size, gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size, - gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment. + gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment. (xg_get_tool_bar_widgets): New function. (xg_tool_bar_menu_proxy, xg_show_toolbar_item) (update_frame_tool_bar): Call xg_get_tool_bar_widgets. @@ -117,7 +149,7 @@ * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar. - * gtkutil.h (xg_show_scroll_bar): : Remove. + * gtkutil.h (xg_show_scroll_bar): Remove. * gtkutil.c (xg_update_scrollbar_pos): Show/hide scroll bar as needed if height is less than scroll bar min size.