Commit a892a94c authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

* nsterm.m (ns_set_terminal_modes, ns_reset_terminal_modes):

Remove no-ops.
(ns_create_terminal): Adjust terminal setup.
* w32term.c (w32_set_terminal_modes, w32_reset_terminal_modes):
Remove no-ops.
(w32_create_terminal): Adjust terminal setup.
* xterm.c (XTset_terminal_modes, XTreset_terminal_modes):
Remove no-ops.
(x_create_terminal): Adjust terminal setup.
parent cf91889a
2013-09-01 Dmitry Antipov <dmantipov@yandex.ru>
* nsterm.m (ns_set_terminal_modes, ns_reset_terminal_modes):
Remove no-ops.
(ns_create_terminal): Adjust terminal setup.
* w32term.c (w32_set_terminal_modes, w32_reset_terminal_modes):
Remove no-ops.
(w32_create_terminal): Adjust terminal setup.
* xterm.c (XTset_terminal_modes, XTreset_terminal_modes):
Remove no-ops.
(x_create_terminal): Adjust terminal setup.
2013-09-01 Dmitry Antipov <dmantipov@yandex.ru>
* dispextern.h (SET_TEXT_POS_FROM_MARKER): Indent.
......
......@@ -963,24 +963,6 @@ Free a pool and temporary objects it refers to (callable from C)
}
}
static void
ns_reset_terminal_modes (struct terminal *terminal)
/* Externally called as hook */
{
NSTRACE (ns_reset_terminal_modes);
}
static void
ns_set_terminal_modes (struct terminal *terminal)
/* Externally called as hook */
{
NSTRACE (ns_set_terminal_modes);
}
/* ==========================================================================
Frame / window manager related functions
......@@ -4050,8 +4032,8 @@ static Lisp_Object ns_string_to_lispmod (const char *s)
terminal->ins_del_lines_hook = 0; /* XXX vestigial? */
terminal->delete_glyphs_hook = 0; /* XXX vestigial? */
terminal->ring_bell_hook = ns_ring_bell;
terminal->reset_terminal_modes_hook = ns_reset_terminal_modes;
terminal->set_terminal_modes_hook = ns_set_terminal_modes;
terminal->reset_terminal_modes_hook = NULL;
terminal->set_terminal_modes_hook = NULL;
terminal->update_begin_hook = ns_update_begin;
terminal->update_end_hook = ns_update_end;
terminal->set_terminal_window_hook = NULL; /* XXX vestigial? */
......
......@@ -224,8 +224,6 @@ void x_wm_set_icon_pixmap (struct frame *, int);
static void w32_initialize (void);
static void x_update_end (struct frame *);
static void w32_frame_up_to_date (struct frame *);
static void w32_set_terminal_modes (struct terminal *);
static void w32_reset_terminal_modes (struct terminal *);
static void x_clear_frame (struct frame *);
static void frame_highlight (struct frame *);
static void frame_unhighlight (struct frame *);
......@@ -934,28 +932,6 @@ w32_destroy_fringe_bitmap (int which)
fringe_bmp[which] = 0;
}
/* This is called when starting Emacs and when restarting after
suspend. When starting Emacs, no window is mapped. And nothing
must be done to Emacs's own window if it is suspended (though that
rarely happens). */
static void
w32_set_terminal_modes (struct terminal *term)
{
}
/* This is called when exiting or suspending Emacs. Exiting will make
the W32 windows go away, and suspending requires no action. */
static void
w32_reset_terminal_modes (struct terminal *term)
{
}
/***********************************************************************
Display Iterator
***********************************************************************/
......@@ -6354,8 +6330,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 = w32_reset_terminal_modes;
terminal->set_terminal_modes_hook = w32_set_terminal_modes;
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 = w32_set_terminal_window;
......
......@@ -297,8 +297,6 @@ static struct terminal *x_create_terminal (struct x_display_info *);
void x_delete_terminal (struct terminal *);
static void x_update_end (struct frame *);
static void XTframe_up_to_date (struct frame *);
static void XTset_terminal_modes (struct terminal *);
static void XTreset_terminal_modes (struct terminal *);
static void x_clear_frame (struct frame *);
static _Noreturn void x_ins_del_lines (struct frame *, int, int);
static void frame_highlight (struct frame *);
......@@ -833,27 +831,6 @@ x_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct draw_fring
XSetClipMask (display, gc, None);
}
/* This is called when starting Emacs and when restarting after
suspend. When starting Emacs, no X window is mapped. And nothing
must be done to Emacs's own window if it is suspended (though that
rarely happens). */
static void
XTset_terminal_modes (struct terminal *terminal)
{
}
/* This is called when exiting or suspending Emacs. Exiting will make
the X-windows go away, and suspending requires no action. */
static void
XTreset_terminal_modes (struct terminal *terminal)
{
}
/***********************************************************************
Glyph display
***********************************************************************/
......@@ -10546,8 +10523,8 @@ x_create_terminal (struct x_display_info *dpyinfo)
terminal->delete_glyphs_hook = x_delete_glyphs;
terminal->ring_bell_hook = XTring_bell;
terminal->toggle_invisible_pointer_hook = XTtoggle_invisible_pointer;
terminal->reset_terminal_modes_hook = XTreset_terminal_modes;
terminal->set_terminal_modes_hook = XTset_terminal_modes;
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 = XTset_terminal_window;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment