Merge from trunk.

1 files changed, 101 insertions, 40 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e67fdada36f..0970bf62b52 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,66 @@
+2013-12-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
+        Avoid unused macro warning if configured --without-xft.
+
+2013-12-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.
+
+2013-12-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.
+
+        * emacs.c (main): Call fixup_locale a second time for GNUStep.
+
+2013-12-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (x_set_font): Mark frame as garbaged (Bug#16028).
+
+2013-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use libcrypto's checksum implementations if available, for speed.
+        * Makefile.in (LIB_CRYPTO): New macro.
+        (LIBES): Use it.
+
+        * frame.h (SET_FRAME_VISIBLE): Now an inline function.
+        The macro didn't conform to C99 due to type mismatch,
+        which caused compilation failure with Sun C 5.12,
+        and it was confusing anyway.  Include window.h to declare
+        redisplay_other_windows.
+
+2013-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (set_window_buffer): Update mode line (bug#16084).
+
+2013-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problems found by static checking.
+        * keyboard.c (poll_for_input_1, input_polling_used):
+        Define only if HAVE_NTGUI.
+        * xmenu.c (popup_activate_callback): Omit unnecessary
+        check against USE_X_TOOLKIT, which must be defined here anyway.
+        * xterm.c, xterm.h (x_dispatch_event) [! (USE_X_TOOLKIT || USE_MOTIF)]:
+        Now static.
+
+2013-12-07  Martin Rudalics  <rudalics@gmx.at>
+
+        * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
+
 2013-12-07  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * gtkutil.c (tb_size_cb): Call xg_height_or_width_changed.
+
+        * nsterm.m (x_set_window_size): Remove fprintf.
+        (init): Define always.  Set applicationDidFinishLaunchingCalled
+        for GNUStep.
+        (applicationDidFinishLaunching:):
+        Set applicationDidFinishLaunchingCalled.
+        (applicationDidBecomeActive:): Call applicationDidFinishLaunching if
+        not called.
+
+        * nsterm.h (EmacsApp): Add applicationDidFinishLaunchingCalled.
+
         Pixel resize changes for NS (Bug#16049).
         * nsterm.m (x_set_window_size): Change parameters rows/cols to
         height/width.  row/cols are locals.
@@ -7,8 +68,8 @@
         (updateFrameSize:): Remove gsextra.  Adjust for pixelwise resize.
         (windowWillResize): Remove gsextra.  Calculate extra as in
         updateFrameSize.
-        (x_new_font): Don't change frame size if fullscreen.  Change
-        size pixelwise.
+        (x_new_font): Don't change frame size if fullscreen.
+        Change size pixelwise.
 
         * nsfns.m (Fx_create_frame): Call change_frame_size twice as per
         comment in xfns.c.  Change to pixelwise call.
@@ -210,8 +271,8 @@
         ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
         (struct glyph_matrix): Replace window_left_col and
         window_top_line by window_pixel_left and window_pixel_top.
-        (WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
-        rewrite.
+        (WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P):
+        Minor rewrite.
         (enum face_id): Add WINDOW_DIVIDER_FACE_ID.
         (draw_window_divider, move_it_to, x_draw_right_divider)
         (x_draw_bottom_divider, change_frame_size): Add or fix
@@ -226,8 +287,8 @@
         (init_display): Adjusts calls of change_frame_size.
         (change_frame_size, change_frame_size_1): Handle pixelwise
         changes.
-        * frame.c (Qright_divider_width, Qbottom_divider_width): New
-        Lisp objects.
+        * frame.c (Qright_divider_width, Qbottom_divider_width):
+        New Lisp objects.
         (set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
         (make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
         (x_set_internal_border_width, x_set_vertical_scroll_bars)
@@ -238,15 +299,15 @@
         (Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
         (Ffringe_width, Fborder_width, Fright_divider_width)
         (Fbottom_divider_width): New functions, defsubr them.
-        (Fset_frame_height, Fset_frame_width, Fset_frame_size): New
-        argument pixelwise.
+        (Fset_frame_height, Fset_frame_width, Fset_frame_size):
+        New argument pixelwise.
         (struct frame_parm_table): New members Qright_divider_width and
         Qbottom_divider_width.
         (x_set_frame_parameters): Handle parameters for pixelwise sizes.
         (x_report_frame_params): Handle Qright_divider_width and
         Qbottom_divider_width.
-        (x_set_right_divider_width, x_set_bottom_divider_width): New
-        functions.
+        (x_set_right_divider_width, x_set_bottom_divider_width):
+        New functions.
         (frame_resize_pixelwise): New option.
         * frame.h (struct frame): Add tool_bar_height, menu_bar_height,
         new_pixelwise, right_divider_width and bottom_divider_width;
@@ -257,8 +318,8 @@
         FRAME_TEXT_WIDTH respectively.
         (FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
         (FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
-        (FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
-        macros.
+        (FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH):
+        New macros.
         (FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
         (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
         (SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
@@ -268,8 +329,8 @@
         * fringe.c (draw_fringe_bitmap_1): Handle right divder.
         * gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
         (x_wm_set_size_hint): Handle frame pixel sizes.
-        * indent.c (compute_motion, Fcompute_motion): Call
-        window_body_width instead of window_body_cols.
+        * indent.c (compute_motion, Fcompute_motion):
+        Call window_body_width instead of window_body_cols.
         * keyboard.c (Qright_divider, Qbottom_divider): New symbols.
         (make_lispy_position): Handle right and bottom dividers.
         (Fsuspend_emacs): Pixelize call of change_frame_size.
@@ -277,13 +338,13 @@
         * lisp.h: Extern set_frame_param.
         * nsfns.m (x_set_tool_bar_lines): Pixelize call of
         x_set_window_size.
-        (Fx_create_frame): Add entry for vertical_drag_cursor.  Pixelize
-        call of change_frame_size.
+        (Fx_create_frame): Add entry for vertical_drag_cursor.
+        Pixelize call of change_frame_size.
         * nsterm.h (struct ns_output): Add vertical_drag_cursor.
         * nsterm.m (ns_update_window_end): Optionally draw right
         divider.
-        (x_set_window_size): Add argument pixelwise.  Call
-        check_frame_size and change_frame_size with pixelwise zero.
+        (x_set_window_size): Add argument pixelwise.
+        Call check_frame_size and change_frame_size with pixelwise zero.
         (ns_draw_window_divider): New function.
         (ns_redisplay_interface): Add ns_draw_window_divider.
         (updateFrameSize:): Call change_frame_size with pixelwise zero.
@@ -294,12 +355,12 @@
         * w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
         (x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
         (w32_createwindow): Use scroll bar area width.
-        (w32_wnd_proc): Handle bottom divider width.  For
-        WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
-        (Fx_create_frame): Default divider width parameters.  Caclulate
-        sizes pixelwise.  Add vertical drag cursor support.
-        (x_create_tip_frame): Default divider widths to zero.  Pixelize
-        call to change_frame_size.
+        (w32_wnd_proc): Handle bottom divider width.
+        For WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
+        (Fx_create_frame): Default divider width parameters.
+        Caclulate sizes pixelwise.  Add vertical drag cursor support.
+        (x_create_tip_frame): Default divider widths to zero.
+        Pixelize call to change_frame_size.
         (Fx_show_tip): Add handling of divider widths.  Pixelize window
         position and sizes.
         (Fw32_frame_rect): New function.
@@ -314,8 +375,8 @@
         (x_update_window_end): Handle right divider.
         (w32_draw_fringe_bitmap, x_scroll_run)
         (w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
-        (w32_read_socket): Handle SIZE_MAXIMIZED separately.  Calculate
-        new frame sizes pixelwise.
+        (w32_read_socket): Handle SIZE_MAXIMIZED separately.
+        Calculate new frame sizes pixelwise.
         (x_new_font): Pixelize call to x_set_window_size.
         (x_check_fullscreen): Pixelize call to change_frame_size.
         (x_set_window_size_1, x_set_window_size): New argument
@@ -334,16 +395,16 @@
         (Fset_window_new_pixel, window_resize_apply_total)
         (Fwindow_resize_apply_total): New functions.
         (window_body_height, window_body_width): Rename from
-        window_body_lines.  New argument PIXELWISE.  Calculate
-        pixelwise.
+        window_body_lines.  New argument PIXELWISE.
+        Calculate pixelwise.
         (Fwindow_body_height, Fwindow_body_width): New argument
         PIXELWISE.
         (coordinates_in_window, window_relative_x_coord): Use window's
         pixel width instead of total width.
         (replace_window, recombine_windows): Initialize pixel values.
         (resize_root_window, resize_frame_windows, grow_mini_window)
-        (shrink_mini_window): New argument PIXELWISE.  Calculate
-        pixelwise.
+        (shrink_mini_window): New argument PIXELWISE.
+        Calculate pixelwise.
         (Fdelete_other_windows_internal, adjust_window_margins)
         (window_resize_check, window_resize_apply)
         (Fdelete_window_internal, Fresize_mini_window_internal)
@@ -368,11 +429,11 @@
         slots in save_window_data and saved_window.
         (Fset_window_scroll_bars): Fix doc-string.
         (window_resize_pixelwise): New variable.
-        (coordinates_in_window, Fcoordinates_in_window_p): Handle
-        dividers.
+        (coordinates_in_window, Fcoordinates_in_window_p):
+        Handle dividers.
         (make_parent_window): Adjust sequence_number.
-        (Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
-        functions.
+        (Fwindow_right_divider_width, Fwindow_bottom_divider_width):
+        New functions.
         * window.h (struct window): New members new_pixel, pixel_left,
         pixel_top, pixel_width, pixel_height.  Restore sequence_number.
         (wset_new_pixel): New function.
@@ -406,10 +467,10 @@
         encountered.
         (Fwindow_text_pixel_size): New function.
         (resize_mini_window, update_tool_bar): Calculate pixelwise.
-        (tool_bar_lines_needed): Rename to tool_bar_height.  Calculate
-        pixelwise.
-        (Ftool_bar_lines_needed): Rename to Ftool_bar_height.  Calculate
-        pixelwise.
+        (tool_bar_lines_needed): Rename to tool_bar_height.
+        Calculate pixelwise.
+        (Ftool_bar_lines_needed): Rename to Ftool_bar_height.
+        Calculate pixelwise.
         (redisplay_tool_bar): Calculate pixelwise.
         (redisplay_window): Calculate pixelwise.  Handle dividers.
         (draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
@@ -424,8 +485,8 @@
         (x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
         (x_set_scroll_bar_default_width): Default actual width to 16.
         (Fx_create_frame): Set sizes pixelwise.
-        (x_create_tip_frame): Default divider widths to zero.  Pixelize
-        call of change_frame_size.
+        (x_create_tip_frame): Default divider widths to zero.
+        Pixelize call of change_frame_size.
         (Fx_show_tip): Handle divider widths.  Initial pixel position
         and sizes.
         (frame_parm_handler x_frame_parm_handlers): Add divider widths.