Mercurial > hg > xemacs-beta

comparison src/console-stream.c @ 404:2f8bb876ab1d r21-2-32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-32
author cvs
date Mon, 13 Aug 2007 11:16:07 +0200
parents 74fd4e045ea6
children 501cfd01ee6d
comparison
equal deleted inserted replaced
403:9f011ab08d48 404:2f8bb876ab1d
326 staticpro (&Vstdio_str); 326 staticpro (&Vstdio_str);
327 } 327 }
328 328
329 #ifndef PDUMP 329 #ifndef PDUMP
330 void 330 void
331 init_console_stream (void) 331 init_console_stream (int reinit)
332 { 332 {
333 /* This function can GC */ 333 /* This function can GC */
334 if (!initialized) 334 if (!initialized)
335 { 335 {
336 Vterminal_device = Fmake_device (Qstream, Qnil, Qnil); 336 Vterminal_device = Fmake_device (Qstream, Qnil, Qnil);
348 } 348 }
349 349
350 #else 350 #else
351 351
352 void 352 void
353 init_console_stream (void) 353 init_console_stream (int reinit)
354 { 354 {
355 /* This function can GC */ 355 /* This function can GC */
356 Vterminal_device = Fmake_device (Qstream, Qnil, Qnil); 356 if (!reinit)
357 Vterminal_console = Fdevice_console (Vterminal_device); 357 {
358 Vterminal_frame = Fmake_frame (Qnil, Vterminal_device); 358 Vterminal_device = Fmake_device (Qstream, Qnil, Qnil);
359 minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window; 359 Vterminal_console = Fdevice_console (Vterminal_device);
360 Vterminal_frame = Fmake_frame (Qnil, Vterminal_device);
361 minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window;
362 }
360 if (initialized) 363 if (initialized)
361 { 364 {
362 stream_init_console (XCONSOLE (Vterminal_console), Qnil); 365 stream_init_console (XCONSOLE (Vterminal_console), Qnil);
363 if (noninteractive) 366 if (noninteractive)
364 event_stream_select_console (XCONSOLE (Vterminal_console)); 367 event_stream_select_console (XCONSOLE (Vterminal_console));