X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-tty.c;h=34bd768bc0e49080a7657dc33d1f87ae40ee45b3;hb=2cbece6401b2279497293e6dc54cda607f49db2f;hp=12fc504c9242c4e4058232f24dd0ac5001d98d9e;hpb=81572e9b4653c5545c2eb43e87dec439f356c19c;p=chise%2Fxemacs-chise.git- diff --git a/src/console-tty.c b/src/console-tty.c index 12fc504..34bd768 100644 --- a/src/console-tty.c +++ b/src/console-tty.c @@ -115,15 +115,15 @@ tty_init_console (struct console *con, Lisp_Object props) tty_con->instream = make_filedesc_input_stream (tty_con->infd, 0, -1, 0); tty_con->outstream = make_filedesc_output_stream (tty_con->outfd, 0, -1, 0); -#ifdef MULE +#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)); -#endif /* MULE */ + Fget_coding_system (Qterminal)); +#endif /* FILE_CODING */ tty_con->terminal_type = terminal_type; tty_con->controlling_process = controlling_process; @@ -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,13 +277,13 @@ 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; } -/* ### Move this function to lisp */ +/* #### Move this function to lisp */ DEFUN ("set-console-tty-coding-system", Fset_console_tty_coding_system, 0, 2, 0, /* Set the input and output coding systems of tty console CONSOLE to CODESYS.