From bb75cdf9c74ab19b75532da1f953233a47eedab4 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov
Date: Tue, 14 Oct 2014 16:45:41 +0400
Subject: 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.

---
 src/coding.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/coding.c')

diff --git a/src/coding.c b/src/coding.c
index f63d710ce9a..e4b52f6db48 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9759,7 +9759,7 @@ DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_intern
        doc: /* Internal use only.  */)
   (Lisp_Object coding_system, Lisp_Object terminal)
 {
-  struct terminal *term = get_terminal (terminal, 1);
+  struct terminal *term = decode_live_terminal (terminal);
   struct coding_system *terminal_coding = TERMINAL_TERMINAL_CODING (term);
   CHECK_SYMBOL (coding_system);
   setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding);
@@ -9800,7 +9800,7 @@ frame's terminal device.  */)
   (Lisp_Object terminal)
 {
   struct coding_system *terminal_coding
-    = TERMINAL_TERMINAL_CODING (get_terminal (terminal, 1));
+    = TERMINAL_TERMINAL_CODING (decode_live_terminal (terminal));
   Lisp_Object coding_system = CODING_ID_NAME (terminal_coding->id);
 
   /* For backward compatibility, return nil if it is `undecided'.  */
@@ -9812,7 +9812,7 @@ DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_intern
        doc: /* Internal use only.  */)
   (Lisp_Object coding_system, Lisp_Object terminal)
 {
-  struct terminal *t = get_terminal (terminal, 1);
+  struct terminal *t = decode_live_terminal (terminal);
   CHECK_SYMBOL (coding_system);
   if (NILP (coding_system))
     coding_system = Qno_conversion;
@@ -9831,7 +9831,7 @@ DEFUN ("keyboard-coding-system",
   (Lisp_Object terminal)
 {
   return CODING_ID_NAME (TERMINAL_KEYBOARD_CODING
-			 (get_terminal (terminal, 1))->id);
+			 (decode_live_terminal (terminal))->id);
 }
 
 
-- 
cgit v1.2.1