resolve ChangeLog merge conflict

1 files changed, 78 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5bab023fd86..b90471e8dea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,80 @@
+2014-12-23  Didier Verna  <didier@didierverna.net> (tiny change).
+
+        * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a
+        C one (Bug#19396).
+
+2014-12-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_bitmap_icon): Partly revert change from 2014-03-21 which
+        breaks icon setting for Gtk+ except for initial frame (Bug#19403).
+
+2014-12-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use bool for boolean in xterm.c
+        * frame.h, nsterm.m, w32term.c, w32term.h, xterm.c:
+        (x_set_window_size, x_bitmap_icon):
+        * nsterm.m (ns_frame_raise_lower, x_new_font):
+        * termhooks.h (struct terminal.toggle_invisible_pointer_hook)
+        (struct terminal.frame_raise_lower_hook):
+        * w32term.c (w32_frame_raise_lower):
+        * xterm.c, xterm.h (x_text_icon):
+        * xterm.c (x_update_window_begin, x_update_window_end)
+        (x_update_end, x_after_update_window_line)
+        (x_set_glyph_string_gc, x_draw_glyph_string_background)
+        (x_draw_glyph_string_foreground)
+        (x_draw_composite_glyph_string_foreground)
+        (x_alloc_lighter_color, x_draw_relief_rect)
+        (x_draw_glyph_string_box, x_draw_image_relief)
+        (x_draw_image_glyph_string, x_draw_stretch_glyph_string)
+        (x_draw_underwave, x_draw_glyph_string, x_show_hourglass)
+        (x_hide_hourglass):
+        (XFillRectangle) [HAVE_GTK3]:
+        (XTtoggle_invisible_pointer, frame_highlight, frame_unhighlight)
+        (x_focus_changed, x_find_modifier_meanings, note_mouse_movement)
+        (XTmouse_position, xt_action_hook, xt_horizontal_action_hook)
+        (x_send_scroll_bar_event, xm_scroll_callback)
+        (xg_scroll_callback, xaw_jump_callback, xaw_scroll_callback)
+        (x_create_toolkit_scroll_bar)
+        (x_create_horizontal_toolkit_scroll_bar)
+        (x_set_toolkit_horizontal_scroll_bar_thumb, x_scroll_bar_create)
+        (x_scroll_bar_set_handle, XTset_vertical_scroll_bar)
+        (XTset_horizontal_scroll_bar, x_scroll_bar_expose)
+        (x_scroll_bar_handle_click, x_scroll_bar_note_movement)
+        (x_scroll_bar_report_motion)
+        (x_horizontal_scroll_bar_report_motion, x_net_wm_state)
+        (handle_one_xevent, XTread_socket, x_draw_bar_cursor)
+        (x_draw_window_cursor, x_clear_errors)
+        (x_trace_wire, x_new_font, x_set_offset, wm_supports)
+        (set_wm_state, x_set_sticky, get_current_wm_state)
+        (do_ewmh_fullscreen, x_handle_net_wm_state)
+        (x_check_expected_move, x_sync_with_move, x_wait_for_event)
+        (x_set_window_size_1, XTframe_raise_lower)
+        (x_make_frame_visible, x_iconify_frame)
+        (x_timeout_atimer_activated_flag, same_x_server, x_display_ok)
+        (x_term_init, x_process_timeouts, x_activate_timeout_atimer)
+        (x_delete_terminal, x_initialize, syms_of_xterm):
+        Use bool for boolean.
+
+2014-12-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * composite.h (struct composition.width): Now int
+        instead of unsigned short, as we prefer signed integers.
+
+        Let charset tick grow past USHRT_MAX
+        * charset.c, charset.h (charset_ordered_list_tick):
+        Now EMACS_UINT, not unsigned short.
+        * fontset.c (reorder_font_vector): Allow the tick to grow to the
+        maximum representable Emacs integer value before wrapping it around.
+
+        Simplify unexec file mode setting
+        * unexaix.c, unexcoff.c, unexelf.c, unexmacosx.c:
+        Don't include <sys/stat.h> when no longer needed.
+        (unexec): Create file with correct mode in the first place,
+        rather than overwriting the mode later and fiddling with the
+        global umask in the mean time.  Avoid bogus usage like
+        'umask (777)', which should have been 'umask (0777)'.
+        (mark_x): Remove. All callers removed.
+
 2014-12-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Minor cleanups for Lisp objects and symbols
@@ -14,6 +91,7 @@
         * nsmenu.m (syms_of_nsmenu):
         * nsselect.m (syms_of_nsselect):
         Prefer DEFSYM to defining by hand.
+        * buffer.c (syms_of_buffer): Omit unneeded staticpros.
         * data.c: Fix too-long line.
         * lisp.h (DECLARE_GDB_SYM): New macro.
         (DEFINE_GDB_SYMBOL_BEGIN): Use it.