From: Stefan Monnier Date: Fri, 7 Nov 2014 16:25:35 +0000 (-0500) Subject: * src/keyboard.c: Call gui-set-selection instead of x-set-selection. X-Git-Tag: emacs-25.0.90~2635^2~544 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3946aeb962440b8e76fea95c31aa518928082cc6;p=emacs.git * src/keyboard.c: Call gui-set-selection instead of x-set-selection. * src/xdisp.c (window-scroll-functions): Improve docstring. --- 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 + + * keyboard.c: Call gui-set-selection instead of x-set-selection. + * xdisp.c (window-scroll-functions): Improve docstring. + 2014-11-07 Paul Eggert 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 @@ -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 * 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 diff --git a/src/keyboard.c b/src/keyboard.c index e16ee51ee0e..24f47bfedc9 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -231,7 +231,7 @@ static ptrdiff_t last_point_position; 'volatile' here. */ Lisp_Object internal_last_event_frame; -static Lisp_Object Qx_set_selection, Qhandle_switch_frame; +static Lisp_Object Qgui_set_selection, Qhandle_switch_frame; static Lisp_Object Qhandle_select_window; Lisp_Object QPRIMARY; @@ -1653,7 +1653,7 @@ command_loop_1 (void) = call1 (Fsymbol_value (Qregion_extract_function), Qnil); if (XINT (Flength (txt)) > 0) /* Don't set empty selections. */ - call2 (Qx_set_selection, QPRIMARY, txt); + call2 (Qgui_set_selection, QPRIMARY, txt); } if (current_buffer != prev_buffer || MODIFF != prev_modiff) @@ -11167,7 +11167,7 @@ syms_of_keyboard (void) DEFSYM (Qpolling_period, "polling-period"); - DEFSYM (Qx_set_selection, "x-set-selection"); + DEFSYM (Qgui_set_selection, "gui-set-selection"); DEFSYM (QPRIMARY, "PRIMARY"); DEFSYM (Qhandle_switch_frame, "handle-switch-frame"); DEFSYM (Qhandle_select_window, "handle-select-window"); diff --git a/src/xdisp.c b/src/xdisp.c index 2cdbade3062..1b015e70709 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -15196,8 +15196,8 @@ try_scrolling (Lisp_Object window, int just_this_one_p, non-zero margins, because scroll_up_aggressively means put point that fraction of window height _from_the_bottom_margin_. */ - if (aggressive_scroll + 2*this_scroll_margin > height) - aggressive_scroll = height - 2*this_scroll_margin; + if (aggressive_scroll + 2 * this_scroll_margin > height) + aggressive_scroll = height - 2 * this_scroll_margin; amount_to_scroll = dy + aggressive_scroll; } } @@ -15290,8 +15290,8 @@ try_scrolling (Lisp_Object window, int just_this_one_p, start_display (&it, w, startp); if (arg_scroll_conservatively) - amount_to_scroll = max (dy, frame_line_height * - max (scroll_step, temp_scroll_step)); + amount_to_scroll = max (dy, frame_line_height + * max (scroll_step, temp_scroll_step)); else if (scroll_step || temp_scroll_step) amount_to_scroll = scroll_max; else @@ -15308,8 +15308,8 @@ try_scrolling (Lisp_Object window, int just_this_one_p, bottom of the window, if the value of scroll_down_aggressively happens to be too large. */ - if (aggressive_scroll + 2*this_scroll_margin > height) - aggressive_scroll = height - 2*this_scroll_margin; + if (aggressive_scroll + 2 * this_scroll_margin > height) + aggressive_scroll = height - 2 * this_scroll_margin; amount_to_scroll = dy + aggressive_scroll; } } @@ -16580,8 +16580,8 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) { int window_total_lines = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) / frame_line_height; - int margin = - scroll_margin > 0 + int margin + = scroll_margin > 0 ? min (scroll_margin, window_total_lines / 4) : 0; ptrdiff_t margin_pos = CHARPOS (startp); @@ -30731,9 +30731,12 @@ all the functions in the list are called, with the frame as argument. */); DEFVAR_LISP ("window-scroll-functions", Vwindow_scroll_functions, doc: /* List of functions to call before redisplaying a window with scrolling. Each function is called with two arguments, the window and its new -display-start position. Note that these functions are also called by -`set-window-buffer'. Also note that the value of `window-end' is not -valid when these functions are called. +display-start position. +These functions are called whenever the `window-start' marker is modified, +either to point into another buffer (e.g. via `set-window-buffer') or another +place in the same buffer. +Note that the value of `window-end' is not valid when these functions are +called. Warning: Do not use this feature to alter the way the window is scrolled. It is not designed for that, and such use probably won't