diff src/console-stream.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29
author cvs
date Mon, 13 Aug 2007 11:13:30 +0200
parents 6719134a07c2
children 2f8bb876ab1d
line wrap: on
line diff
--- a/src/console-stream.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/console-stream.c	Mon Aug 13 11:13:30 2007 +0200
@@ -171,7 +171,7 @@
 
 static int
 stream_text_width (struct frame *f, struct face_cachel *cachel,
-		   CONST Emchar *str, Charcount len)
+		   const Emchar *str, Charcount len)
 {
   return len;
 }
@@ -298,6 +298,12 @@
 }
 
 void
+reinit_console_type_create_stream (void)
+{
+  REINITIALIZE_CONSOLE_TYPE (stream);
+}
+
+void
 vars_of_console_stream (void)
 {
   DEFVAR_LISP ("terminal-console", &Vterminal_console /*
@@ -320,6 +326,7 @@
   staticpro (&Vstdio_str);
 }
 
+#ifndef PDUMP
 void
 init_console_stream (void)
 {
@@ -339,3 +346,22 @@
         event_stream_select_console (XCONSOLE (Vterminal_console));
     }
 }
+
+#else
+
+void
+init_console_stream (void)
+{
+  /* This function can GC */
+  Vterminal_device = Fmake_device (Qstream, Qnil, Qnil);
+  Vterminal_console = Fdevice_console (Vterminal_device);
+  Vterminal_frame = Fmake_frame (Qnil, Vterminal_device);
+  minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window;
+  if (initialized)
+    {
+      stream_init_console (XCONSOLE (Vterminal_console), Qnil);
+      if (noninteractive)
+	event_stream_select_console (XCONSOLE (Vterminal_console));
+    }
+}
+#endif