aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.13
diff options
context:
space:
mode:
authorK. Handa2015-09-01 20:46:15 +0900
committerK. Handa2015-09-01 20:46:15 +0900
commit3e0e2339cd379eeba8d9bc758f2e8e574144e252 (patch)
tree9d119efed6e52e5c24dbd84836148157271799a8 /src/ChangeLog.13
parent524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 (diff)
parentff0a92f6461941902eb9e974bdd2ff9adacb7bc4 (diff)
downloademacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.gz
emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/ChangeLog.13')
-rw-r--r--src/ChangeLog.137
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 196bd8e0d6d..ac2162830c4 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -5245,8 +5245,7 @@
5245 (xg_set_toolkit_horizontal_scroll_bar_thumb) 5245 (xg_set_toolkit_horizontal_scroll_bar_thumb)
5246 (xg_get_default_scrollbar_height) 5246 (xg_get_default_scrollbar_height)
5247 (xg_clear_under_internal_border): Extern. 5247 (xg_clear_under_internal_border): Extern.
5248 * gtkutil.c (xg_frame_resized): Don't call 5248 * gtkutil.c (xg_frame_resized): Call do_pending_window_change.
5249 do_pending_window_change.
5250 (xg_frame_set_char_size): Use adjust_frame_size. 5249 (xg_frame_set_char_size): Use adjust_frame_size.
5251 (style_changed_cb): Call update_theme_scrollbar_height and 5250 (style_changed_cb): Call update_theme_scrollbar_height and
5252 x_set_scroll_bar_default_height. 5251 x_set_scroll_bar_default_height.
@@ -5367,7 +5366,7 @@
5367 build without toolkit. Always clear under internal border. 5366 build without toolkit. Always clear under internal border.
5368 (x_set_window_size): Don't check frame size or recompute 5367 (x_set_window_size): Don't check frame size or recompute
5369 fringes. Reset fullscreen status before applying sizes. 5368 fringes. Reset fullscreen status before applying sizes.
5370 Always resize as requested by pixelwise argument. Don't call 5369 Always resize as requested by pixelwise argument. Call
5371 do_pending_window_change. 5370 do_pending_window_change.
5372 (x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT. 5371 (x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT.
5373 (w32_initialize_display_info): Initialize dpyinfo's 5372 (w32_initialize_display_info): Initialize dpyinfo's
@@ -5519,7 +5518,7 @@
5519 Call x_net_wm_state. 5518 Call x_net_wm_state.
5520 (x_set_window_size_1, x_wm_set_size_hint): Don't call 5519 (x_set_window_size_1, x_wm_set_size_hint): Don't call
5521 check_frame_size. 5520 check_frame_size.
5522 (x_set_window_size): Don't call check_frame_size and 5521 (x_set_window_size): Don't call check_frame_size. Call
5523 do_pending_window_change. 5522 do_pending_window_change.
5524 (x_term_init): Init horizontal_scroll_bar_cursor display info. 5523 (x_term_init): Init horizontal_scroll_bar_cursor display info.
5525 (x_create_terminal): Add set_horizontal_scroll_bar_hook. 5524 (x_create_terminal): Add set_horizontal_scroll_bar_hook.