comparison src/dispnew.c @ 14125:2f222e8b06f5

(init_display): Treat null string DISPLAY var like not set.

14124:d47a86dabe95

  /* 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 (! display_arg)
    {
#ifdef VMS
      display_arg = (getenv ("DECW$DISPLAY") != 0);
#else
      display_arg = (getenv ("DISPLAY") != 0);
#endif
    }

  if (!inhibit_window_system && display_arg)
    {
      Vwindow_system = intern ("x");

14125:2f222e8b06f5

  /* 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 and nonempty,
     try to use X, and die with an error message if that doesn't work.  */

#ifdef HAVE_X_WINDOWS
  if (! display_arg)
    {
      char *display;
#ifdef VMS
      display = getenv ("DECW$DISPLAY");
#else
      display = getenv ("DISPLAY");
#endif

      display_arg = (display != 0 && *display != 0);
    }

  if (!inhibit_window_system && display_arg)
    {
      Vwindow_system = intern ("x");