aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-10-14 16:45:41 +0400
committerDmitry Antipov2014-10-14 16:45:41 +0400
commitbb75cdf9c74ab19b75532da1f953233a47eedab4 (patch)
treeb8b4d07acaf36cdce7485fb459e7376975ebd5f7 /src/xselect.c
parent5fa75d8eba2d43408fd7831dcfd69c21e31c21f3 (diff)
downloademacs-bb75cdf9c74ab19b75532da1f953233a47eedab4.tar.gz
emacs-bb75cdf9c74ab19b75532da1f953233a47eedab4.zip
Cleanup terminal handling code.
* dispextern.h (get_named_tty): Remove prototype but... * termhooks.h (get_named_terminal): ...resurrect it under more meaningful name. (get_terminal): Likewise, but with... (decode_live_terminal): ...this name. (decode_tty_terminal): Add prototype. * term.c (get_tty_terminal): Remove. (get_named_tty): Remove. (Ftty_display_color_p, Ftty_display_color_cells, Ftty_type) (Fcontrolling_tty_p, Fsuspend_tty, Fresume_tty): Use decode_tty_terminal. (Ftty_no_underline, Ftty_top_frame): Use decode_live_terminal. * terminal.c (get_terminal): Refactor to... (decode_terminal, decode_live_terminal): ...new functions. (decode_tty_terminal): Replacement for get_tty_terminal. (get_named_terminal): Likewise for get_named_tty. * coding.c (Fset_terminal_coding_system_internal) (Fterminal_coding_system, Fset_keyboard_coding_system_internal): (Fkeyboard_coding_system): * composite.c (Fcomposition_get_gstring): * dispnew.c (Fsend_string_to_terminal): * frame.c (Fmake_terminal_frame): * nsfns.m (check_ns_display_info): * w32fns.c, xfns.c (check_x_display_info): * xselect.c (frame_for_x_selection): Use decode_live_terminal. * keyboard.c (handle_interrupt_signal, handle_interrupt) (Fset_quit_char): Use get_named_terminal. (Fset_output_flow_control, Fset_input_meta_mode): Use decode_tty_terminal.
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 9b57a95b26b..92e89822293 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1901,7 +1901,7 @@ frame_for_x_selection (Lisp_Object object)
1901 } 1901 }
1902 else if (TERMINALP (object)) 1902 else if (TERMINALP (object))
1903 { 1903 {
1904 struct terminal *t = get_terminal (object, 1); 1904 struct terminal *t = decode_live_terminal (object);
1905 1905
1906 if (t->type == output_x_window) 1906 if (t->type == output_x_window)
1907 FOR_EACH_FRAME (tail, frame) 1907 FOR_EACH_FRAME (tail, frame)