# HG changeset patch # User Jim Blandy # Date 732937895 0 # Node ID a302de11debff598dc0c737948b4d7e330ec7c7e # Parent 36cc4399937f0d387fe95a03dbc949956e4eadbc * dispnew.c (init_display): Initialize Vwindow_system. diff -r 36cc4399937f -r a302de11debf src/dispnew.c --- a/src/dispnew.c Wed Mar 24 01:46:10 1993 +0000 +++ b/src/dispnew.c Wed Mar 24 01:51:35 1993 +0000 @@ -1981,17 +1981,17 @@ cursor_in_echo_area = 0; terminal_type = (char *) 0; - /* If the DISPLAY environment variable is set, try to use X, and - die with an error message if that doesn't work. */ - - /* Check if we're using a window system here before trying to - initialize the terminal. If we check the terminal first, + /* Now is the time to initialize this; it's used by init_sys_modes + during startup. */ + Vwindow_system = Qnil; - If someone has indicated that they want - to use a window system, we shouldn't bother initializing the - terminal. This is especially important when the terminal is so - dumb that emacs gives up before and doesn't bother using the window - system. */ + /* If the user wants to use a window system, we shouldn't bother + initializing the terminal. This is especially important when the + terminal is so dumb that emacs gives up before and doesn't bother + using the window system. + + If the DISPLAY environment variable is set, try to use X, and die + with an error message if that doesn't work. */ #ifdef HAVE_X_WINDOWS if (!inhibit_window_system && (display_arg || getenv ("DISPLAY")))