* src/keyboard.c: Call gui-set-selection instead of x-set-selection.

* src/xdisp.c (window-scroll-functions): Improve docstring.

1 files changed, 20 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 95880e806ee..a2a4e9dccaf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c: Call gui-set-selection instead of x-set-selection.
+        * xdisp.c (window-scroll-functions): Improve docstring.
+
 2014-11-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Uniquify the 'size' symbol.
@@ -21,11 +26,11 @@
         (Fset_frame_size, x_set_left_fringe, x_set_right_fringe)
         (x_set_right_divider_width, x_set_bottom_divider_width)
         (x_set_vertical_scroll_bars, x_set_horizontal_scroll_bars)
-        (x_set_scroll_bar_width, x_set_scroll_bar_height): Update
-        callers.
+        (x_set_scroll_bar_width, x_set_scroll_bar_height):
+        Update callers.
         (frame-inhibit-implied-resize): Rewrite doc-string.
-        * frame.h (frame_inhibit_resize, adjust_frame_size): Fix
-        external declarations.
+        * frame.h (frame_inhibit_resize, adjust_frame_size):
+        Fix external declarations.
         (Qframe_position, Qframe_outer_size)
         (Qframe_inner_size, Qexternal_border_size, Qtitle_height)
         (Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external)
@@ -36,11 +41,10 @@
         (menubar_map_cb, xg_update_frame_menubar, free_frame_menubar)
         (tb_size_cb, update_frame_tool_bar, free_frame_tool_bar)
         (xg_change_toolbar_position): Call adjust_frame_size directly.
-        * nsfns.m (x_set_internal_border_width, Fx_create_frame): Fix
-        calls of adjust_frame_size.
+        * nsfns.m (x_set_internal_border_width, Fx_create_frame):
+        Fix calls of adjust_frame_size.
         * w32fns.c (x_set_internal_border_width, x_set_menu_bar_lines)
-        (Fx_create_frame, x_create_tip_frame): Adjust adjust_frame_size
-        calls.
+        (Fx_create_frame, x_create_tip_frame): Adjust adjust_frame_size calls.
         (x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that
         frame can get resized when tool-bar-lines parameter changes from
         or to zero.
@@ -49,10 +53,8 @@
         (Fx_frame_geometry): New function.
         * w32menu.c (set_frame_menubar): Adjust adjust_frame_size call.
         * w32term.c (x_new_font): Adjust adjust_frame_size call.
-        * widget.c (EmacsFrameSetCharSize): Adjust frame_inhibit_resize
-        call.
-        * window.c (Fset_window_configuration): Adjust adjust_frame_size
-        call.
+        * widget.c (EmacsFrameSetCharSize): Adjust frame_inhibit_resize call.
+        * window.c (Fset_window_configuration): Adjust adjust_frame_size call.
         * xfns.c (x_set_menu_bar_lines, x_set_internal_border_width)
         (Fx_create_frame): Adjust adjust_frame_size calls.
         (x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that
@@ -170,8 +172,8 @@
         * fileio.c (Fexpand_file_name): Use make_unibyte_string, not
         build_string, when importing a home directory.  (Bug#18873)
 
-        * dispnew.c (buffer_posn_from_coords): Use
-        WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
+        * dispnew.c (buffer_posn_from_coords):
+        Use WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
         account for the header-line height.  (Bug#18839)
 
 2014-10-28  Ulf Jasper  <ulf.jasper@web.de>
@@ -186,8 +188,8 @@
         (ns_string_to_pasteboard_internal): Correct comment.
         type => gtype in eassert, Call ns_store_pb_change_count.
         (Fns_own_selection_internal): Remove data, use value (Bug#18799).
-        (Fns_disown_selection_internal, Fns_selection_owner_p): Replace
-        Vselection_alist check, with change count check.
+        (Fns_disown_selection_internal, Fns_selection_owner_p):
+        Replace Vselection_alist check, with change count check.
         (Fns_get_selection): Initialize val to Qnil.  Only get local
         selection if change counts match (Bug#18799).
         (nxatoms_of_nsselect): Initialize pasteboard_changecount.
@@ -213,8 +215,8 @@
 2014-10-23  Martin Rudalics  <rudalics@gmx.at>
 
         * frame.c (Fset_frame_height, Fset_frame_width, Fset_frame_size)
-        (frame_resize_pixelwise, frame_inhibit_implied_resize): Fix
-        doc-strings (Bug#18789).
+        (frame_resize_pixelwise, frame_inhibit_implied_resize):
+        Fix doc-strings (Bug#18789).
 
 2014-10-23  Paul Eggert  <eggert@cs.ucla.edu>