X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-tty.c;h=56cd3250124736fd15a65cfd4283c0c5ac51a07a;hb=4722bc54af41d050cb2bf24670d152f3fb0547b7;hp=9ebfbf3a072bf903946a102c150cd35593aa7ab1;hpb=3890a2e3064a7f562107c58e59d928284ec04741;p=chise%2Fxemacs-chise.git.1

diff --git a/src/console-tty.c b/src/console-tty.c
index 9ebfbf3..56cd325 100644
--- a/src/console-tty.c
+++ b/src/console-tty.c
@@ -118,11 +118,11 @@ tty_init_console (struct console *con, Lisp_Object props)
 #ifdef FILE_CODING
   tty_con->instream =
     make_decoding_input_stream (XLSTREAM (tty_con->instream),
-				Fget_coding_system (Vkeyboard_coding_system));
+				Fget_coding_system (Qkeyboard));
   Lstream_set_character_mode (XLSTREAM (tty_con->instream));
   tty_con->outstream =
     make_encoding_output_stream (XLSTREAM (tty_con->outstream),
-				 Fget_coding_system (Vterminal_coding_system));
+				 Fget_coding_system (Qterminal));
 #endif /* FILE_CODING */
   tty_con->terminal_type = terminal_type;
   tty_con->controlling_process = controlling_process;
@@ -130,8 +130,8 @@ tty_init_console (struct console *con, Lisp_Object props)
   if (NILP (CONSOLE_NAME (con)))
     CONSOLE_NAME (con) = Ffile_name_nondirectory (tty);
   {
-    int tty_pg;
-    int controlling_tty_pg;
+    pid_t tty_pg;
+    pid_t controlling_tty_pg;
     int cfd;
 
     /* OK, the only sure-fire way I can think of to determine
@@ -253,7 +253,7 @@ CODESYS defaults to the value of `keyboard-coding-system'.
 {
   set_decoding_stream_coding_system
     (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->instream),
-     Fget_coding_system (NILP (codesys) ? Vkeyboard_coding_system : codesys));
+     Fget_coding_system (NILP (codesys) ? Qkeyboard : codesys));
   return Qnil;
 }
 
@@ -277,7 +277,7 @@ CODESYS defaults to the value of `terminal-coding-system'.
 {
   set_encoding_stream_coding_system
     (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->outstream),
-     Fget_coding_system (NILP (codesys) ? Vterminal_coding_system : codesys));
+     Fget_coding_system (NILP (codesys) ? Qterminal : codesys));
   /* Redraw tty */
   face_property_was_changed (Vdefault_face, Qfont, Qtty);
   return Qnil;