From 0c7f856e9f368a56404041ac1d2118f459f2679b Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 2 Sep 2013 07:39:06 +0400 Subject: [PATCH] * msdos.c (IT_set_terminal_window): Remove no-op. (initialize_msdos_display): Adjust terminal setup. * w32console.c (w32con_set_terminal_window): Remove no-op. (initialize_w32_display): Adjust terminal setup. * w32term.c (w32_set_terminal_window): Remove no-op. (w32_create_terminal): Adjust terminal setup. * xterm.c (XTset_terminal_window): Remove no-op. (x_create_terminal): Adjust terminal setup. --- src/ChangeLog | 11 +++++++++++ src/msdos.c | 7 +------ src/w32console.c | 8 +------- src/w32term.c | 15 +-------------- src/xterm.c | 16 +--------------- 5 files changed, 15 insertions(+), 42 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 48305361f96..f1a6bc79751 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2013-09-02 Dmitry Antipov + + * msdos.c (IT_set_terminal_window): Remove no-op. + (initialize_msdos_display): Adjust terminal setup. + * w32console.c (w32con_set_terminal_window): Remove no-op. + (initialize_w32_display): Adjust terminal setup. + * w32term.c (w32_set_terminal_window): Remove no-op. + (w32_create_terminal): Adjust terminal setup. + * xterm.c (XTset_terminal_window): Remove no-op. + (x_create_terminal): Adjust terminal setup. + 2013-09-01 Dmitry Antipov * nsterm.m (ns_set_terminal_modes, ns_reset_terminal_modes): diff --git a/src/msdos.c b/src/msdos.c index 3c78efbc47b..025b685e26c 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1546,11 +1546,6 @@ IT_reset_terminal_modes (struct terminal *term) term_setup_done = 0; } -static void -IT_set_terminal_window (struct frame *f, int foo) -{ -} - /* Remember the screen colors of the current frame, to serve as the default colors for newly-created frames. */ DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors, @@ -1871,7 +1866,7 @@ initialize_msdos_display (struct terminal *term) term->ring_bell_hook = IT_ring_bell; term->reset_terminal_modes_hook = IT_reset_terminal_modes; term->set_terminal_modes_hook = IT_set_terminal_modes; - term->set_terminal_window_hook = IT_set_terminal_window; + term->set_terminal_window_hook = NULL; term->update_begin_hook = IT_update_begin; term->update_end_hook = IT_update_end; term->frame_up_to_date_hook = IT_frame_up_to_date; diff --git a/src/w32console.c b/src/w32console.c index a707344efc8..8da1ccf1892 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -53,7 +53,6 @@ static void w32con_write_glyphs (struct frame *f, struct glyph *string, int len) static void w32con_delete_glyphs (struct frame *f, int n); static void w32con_reset_terminal_modes (struct terminal *t); static void w32con_set_terminal_modes (struct terminal *t); -static void w32con_set_terminal_window (struct frame *f, int size); static void w32con_update_begin (struct frame * f); static void w32con_update_end (struct frame * f); static WORD w32_face_attributes (struct frame *f, int face_id); @@ -497,11 +496,6 @@ w32con_update_end (struct frame * f) SetConsoleCursorPosition (cur_screen, cursor_coords); } -static void -w32con_set_terminal_window (struct frame *f, int size) -{ -} - /*********************************************************************** stubs from termcap.c ***********************************************************************/ @@ -619,7 +613,7 @@ initialize_w32_display (struct terminal *term, int *width, int *height) term->ring_bell_hook = w32_sys_ring_bell; term->reset_terminal_modes_hook = w32con_reset_terminal_modes; term->set_terminal_modes_hook = w32con_set_terminal_modes; - term->set_terminal_window_hook = w32con_set_terminal_window; + term->set_terminal_window_hook = NULL; term->update_begin_hook = w32con_update_begin; term->update_end_hook = w32con_update_end; diff --git a/src/w32term.c b/src/w32term.c index 82a003560a9..4cf025771b4 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2665,19 +2665,6 @@ w32_ring_bell (struct frame *f) unblock_input (); } - -/* Specify how many text lines, from the top of the window, - should be affected by insert-lines and delete-lines operations. - This, and those operations, are used only within an update - that is bounded by calls to x_update_begin and x_update_end. */ - -static void -w32_set_terminal_window (struct frame *f, int n) -{ - /* This function intentionally left blank. */ -} - - /*********************************************************************** Line Dance ***********************************************************************/ @@ -6334,7 +6321,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo) terminal->set_terminal_modes_hook = NULL; terminal->update_begin_hook = x_update_begin; terminal->update_end_hook = x_update_end; - terminal->set_terminal_window_hook = w32_set_terminal_window; + terminal->set_terminal_window_hook = NULL; terminal->read_socket_hook = w32_read_socket; terminal->frame_up_to_date_hook = w32_frame_up_to_date; terminal->mouse_position_hook = w32_mouse_position; diff --git a/src/xterm.c b/src/xterm.c index c6c181a4371..2a5807a81b5 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -3186,20 +3186,6 @@ XTring_bell (struct frame *f) } } - -/* Specify how many text lines, from the top of the window, - should be affected by insert-lines and delete-lines operations. - This, and those operations, are used only within an update - that is bounded by calls to x_update_begin and x_update_end. */ - -static void -XTset_terminal_window (struct frame *f, int n) -{ - /* This function intentionally left blank. */ -} - - - /*********************************************************************** Line Dance ***********************************************************************/ @@ -10527,7 +10513,7 @@ x_create_terminal (struct x_display_info *dpyinfo) terminal->set_terminal_modes_hook = NULL; terminal->update_begin_hook = x_update_begin; terminal->update_end_hook = x_update_end; - terminal->set_terminal_window_hook = XTset_terminal_window; + terminal->set_terminal_window_hook = NULL; terminal->read_socket_hook = XTread_socket; terminal->frame_up_to_date_hook = XTframe_up_to_date; terminal->mouse_position_hook = XTmouse_position; -- 2.39.2