diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-05-14 17:55:37 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-05-14 17:55:37 +0400 |
| commit | 6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8 (patch) | |
| tree | 18e260eef312d3459cb0908206bbfa621cf66808 /src/w32term.c | |
| parent | c5aed7bd9330c2bde33abfe1724af820273b457a (diff) | |
| download | emacs-6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8.tar.gz | |
Minor cleanup for terminal setup.
* termhooks.h (create_terminal): Adjust prototype.
* terminal.c (create_terminal): Pass output method and RIF as args.
(init_initial_terminal):
* nsterm.m (ns_create_terminal):
* term.c (init_tty):
* w32term.c (w32_create_terminal):
* xterm.c (x_create_terminal): Adjust users.
Avoid redundant NULL initializers and add comments.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/w32term.c b/src/w32term.c index 3aabf92357a..aa65af4afd3 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6272,9 +6272,8 @@ w32_create_terminal (struct w32_display_info *dpyinfo) { struct terminal *terminal; - terminal = create_terminal (); + terminal = create_terminal (output_w32, &w32_redisplay_interface); - terminal->type = output_w32; terminal->display_info.w32 = dpyinfo; dpyinfo->terminal = terminal; @@ -6284,11 +6283,8 @@ w32_create_terminal (struct w32_display_info *dpyinfo) terminal->ins_del_lines_hook = x_ins_del_lines; terminal->delete_glyphs_hook = x_delete_glyphs; terminal->ring_bell_hook = w32_ring_bell; - terminal->reset_terminal_modes_hook = NULL; - 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 = 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; @@ -6299,11 +6295,9 @@ w32_create_terminal (struct w32_display_info *dpyinfo) terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars; terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar; terminal->judge_scroll_bars_hook = w32_judge_scroll_bars; - terminal->delete_frame_hook = x_destroy_window; terminal->delete_terminal_hook = x_delete_terminal; - - terminal->rif = &w32_redisplay_interface; + /* Other hooks are NULL by default. */ /* We don't yet support separate terminals on W32, so don't try to share keyboards between virtual terminals that are on the same physical |