--- a/src/console-tty.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/console-tty.c	Mon Aug 13 11:20:41 2007 +0200
@@ -32,18 +32,16 @@
 #include "faces.h"
 #include "frame.h"
 #include "lstream.h"
-#include "glyphs.h"
 #include "sysdep.h"
 #include "sysfile.h"
 #ifdef FILE_CODING
 #include "file-coding.h"
 #endif
+#ifdef HAVE_GPM
+#include "gpmevent.h"
+#endif
 
 DEFINE_CONSOLE_TYPE (tty);
-DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing);
-DECLARE_IMAGE_INSTANTIATOR_FORMAT (string);
-DECLARE_IMAGE_INSTANTIATOR_FORMAT (formatted_string);
-DECLARE_IMAGE_INSTANTIATOR_FORMAT (inherit);
 
 Lisp_Object Qterminal_type;
 Lisp_Object Qcontrolling_process;
@@ -115,18 +113,22 @@
 
   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 FILE_CODING
+#ifdef MULE
   tty_con->instream =
     make_decoding_input_stream (XLSTREAM (tty_con->instream),
-				Fget_coding_system (Qkeyboard));
+				Fget_coding_system (Vkeyboard_coding_system));
   Lstream_set_character_mode (XLSTREAM (tty_con->instream));
   tty_con->outstream =
     make_encoding_output_stream (XLSTREAM (tty_con->outstream),
-				 Fget_coding_system (Qterminal));
-#endif /* FILE_CODING */
+				 Fget_coding_system (Vterminal_coding_system));
+#endif /* MULE */
   tty_con->terminal_type = terminal_type;
   tty_con->controlling_process = controlling_process;
 
+#ifdef HAVE_GPM
+  connect_to_gpm (con);
+#endif
+
   if (NILP (CONSOLE_NAME (con)))
     CONSOLE_NAME (con) = Ffile_name_nondirectory (tty);
   {
@@ -159,12 +161,12 @@
 }
 
 static void
-tty_mark_console (struct console *con)
+tty_mark_console (struct console *con, void (*markobj) (Lisp_Object))
 {
   struct tty_console *tty_con = CONSOLE_TTY_DATA (con);
-  mark_object (tty_con->terminal_type);
-  mark_object (tty_con->instream);
-  mark_object (tty_con->outstream);
+  markobj (tty_con->terminal_type);
+  markobj (tty_con->instream);
+  markobj (tty_con->outstream);
 }
 
 static int
@@ -253,7 +255,7 @@
 {
   set_decoding_stream_coding_system
     (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->instream),
-     Fget_coding_system (NILP (codesys) ? Qkeyboard : codesys));
+     Fget_coding_system (NILP (codesys) ? Vkeyboard_coding_system : codesys));
   return Qnil;
 }
 
@@ -277,13 +279,11 @@
 {
   set_encoding_stream_coding_system
     (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->outstream),
-     Fget_coding_system (NILP (codesys) ? Qterminal : codesys));
-  /* Redraw tty */
-  face_property_was_changed (Vdefault_face, Qfont, Qtty);
+     Fget_coding_system (NILP (codesys) ? Vterminal_coding_system : codesys));
   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.
@@ -367,21 +367,6 @@
 }
 
 void
-reinit_console_type_create_tty (void)
-{
-  REINITIALIZE_CONSOLE_TYPE (tty);
-}
-
-void
-image_instantiator_format_create_glyphs_tty (void)
-{
-  IIFORMAT_VALID_CONSOLE (tty, nothing);
-  IIFORMAT_VALID_CONSOLE (tty, string);
-  IIFORMAT_VALID_CONSOLE (tty, formatted_string);
-  IIFORMAT_VALID_CONSOLE (tty, inherit);
-}
-
-void
 vars_of_console_tty (void)
 {
   Fprovide (Qtty);